From: Ben Hutchings Date: Sun, 9 Dec 2012 16:40:31 +0000 (+0000) Subject: firmware: Remove redundant log messages from drivers X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~127 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/%22mailto:kde%40ewsoftware.de//%22style.css/%22/%22http:/www.example.com/%22mailto:kde%40ewsoftware.de/%22style.css/%22?a=commitdiff_plain;h=a823289e200047970f7ac442adbe175100733bdf;p=linux-4.9.git firmware: Remove redundant log messages from drivers Now that firmware_class logs every success and failure consistently, many other log messages can be removed from drivers. This will probably need to be split up into multiple patches prior to upstream submission. Gbp-Pq: Topic bugfix/all Gbp-Pq: Name firmware-remove-redundant-log-messages-from-drivers.patch --- diff --git a/arch/arm/mach-netx/xc.c b/arch/arm/mach-netx/xc.c index f1c972d87bac..496778446b14 100644 --- a/arch/arm/mach-netx/xc.c +++ b/arch/arm/mach-netx/xc.c @@ -127,10 +127,8 @@ int xc_request_firmware(struct xc *x) ret = request_firmware(&fw, name, x->dev); - if (ret < 0) { - dev_err(x->dev, "request_firmware failed\n"); + if (ret) return ret; - } head = (struct fw_header *)fw->data; if (head->magic != 0x4e657458) { diff --git a/arch/cris/arch-v32/drivers/iop_fw_load.c b/arch/cris/arch-v32/drivers/iop_fw_load.c index 2f8ea0f7a63c..4b8e651935fe 100644 --- a/arch/cris/arch-v32/drivers/iop_fw_load.c +++ b/arch/cris/arch-v32/drivers/iop_fw_load.c @@ -74,12 +74,7 @@ int iop_fw_load_spu(const unsigned char *fw_name, unsigned int spu_inst) fw_name, &iop_spu_device[spu_inst]); if (retval != 0) - { - printk(KERN_ERR - "iop_load_spu: Failed to load firmware \"%s\"\n", - fw_name); return retval; - } data = (u32 *) fw_entry->data; /* acquire ownership of memory controller */ @@ -137,12 +132,7 @@ int iop_fw_load_mpu(unsigned char *fw_name) /* get firmware */ retval = request_firmware(&fw_entry, fw_name, &iop_mpu_device); if (retval != 0) - { - printk(KERN_ERR - "iop_load_spu: Failed to load firmware \"%s\"\n", - fw_name); return retval; - } data = (u32 *) fw_entry->data; /* disable MPU */ diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index 2233f8a76615..297319cbf3ae 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -907,10 +907,8 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device, if (c->x86 >= 0x15) snprintf(fw_name, sizeof(fw_name), "amd-ucode/microcode_amd_fam%.2xh.bin", c->x86); - if (request_firmware_direct(&fw, (const char *)fw_name, device)) { - pr_debug("failed to load file %s\n", fw_name); + if (request_firmware_direct(&fw, (const char *)fw_name, device)) goto out; - } ret = UCODE_ERROR; if (*(u32 *)fw->data != UCODE_MAGIC) { diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c index f1a9198dfe5a..90f2568f63c5 100644 --- a/drivers/atm/ambassador.c +++ b/drivers/atm/ambassador.c @@ -1929,10 +1929,8 @@ static int ucode_init(loader_block *lb, amb_dev *dev) int res; res = request_ihex_firmware(&fw, "atmsar11.fw", &dev->pci_dev->dev); - if (res) { - PRINTK (KERN_ERR, "Cannot load microcode data"); + if (res) return res; - } /* First record contains just the start address */ rec = (const struct ihex_binrec *)fw->data; diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c index 75dde903b238..573bbb7b0016 100644 --- a/drivers/atm/fore200e.c +++ b/drivers/atm/fore200e.c @@ -2506,10 +2506,9 @@ static int fore200e_load_and_start_fw(struct fore200e *fore200e) return err; sprintf(buf, "%s%s", fore200e->bus->proc_name, FW_EXT); - if ((err = request_firmware(&firmware, buf, device)) < 0) { - printk(FORE200E "problem loading firmware image %s\n", fore200e->bus->model_name); + err = request_firmware(&firmware, buf, device); + if (err) return err; - } fw_data = (__le32 *) firmware->data; fw_size = firmware->size / sizeof(u32); diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c index fa893c3ec408..3a7b8af029b4 100644 --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c @@ -408,10 +408,8 @@ static int ath3k_load_patch(struct usb_device *udev) le32_to_cpu(fw_version.rom_version)); ret = request_firmware(&firmware, filename, &udev->dev); - if (ret < 0) { - BT_ERR("Patch file not found %s", filename); + if (ret) return ret; - } pt_rom_version = get_unaligned_le32(firmware->data + firmware->size - 8); @@ -471,10 +469,8 @@ static int ath3k_load_syscfg(struct usb_device *udev) le32_to_cpu(fw_version.rom_version), clk_value, ".dfu"); ret = request_firmware(&firmware, filename, &udev->dev); - if (ret < 0) { - BT_ERR("Configuration file not found %s", filename); + if (ret) return ret; - } ret = ath3k_load_fwfile(udev, firmware); release_firmware(firmware); diff --git a/drivers/bluetooth/bcm203x.c b/drivers/bluetooth/bcm203x.c index 364f82b34d03..bba312c4b488 100644 --- a/drivers/bluetooth/bcm203x.c +++ b/drivers/bluetooth/bcm203x.c @@ -193,7 +193,6 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id } if (request_firmware(&firmware, "BCM2033-MD.hex", &udev->dev) < 0) { - BT_ERR("Mini driver request failed"); usb_free_urb(data->urb); return -EIO; } @@ -218,7 +217,6 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id release_firmware(firmware); if (request_firmware(&firmware, "BCM2033-FW.bin", &udev->dev) < 0) { - BT_ERR("Firmware request failed"); usb_free_urb(data->urb); kfree(data->buffer); return -EIO; diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c index 616ec2ac1b22..5b2ed0cfe9b1 100644 --- a/drivers/bluetooth/bfusb.c +++ b/drivers/bluetooth/bfusb.c @@ -653,10 +653,8 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i skb_queue_head_init(&data->pending_q); skb_queue_head_init(&data->completed_q); - if (request_firmware(&firmware, "bfubase.frm", &udev->dev) < 0) { - BT_ERR("Firmware request failed"); + if (request_firmware(&firmware, "bfubase.frm", &udev->dev)) goto done; - } BT_DBG("firmware data %p size %zu", firmware->data, firmware->size); diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index 5803aaed958f..1fecc5498865 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c @@ -565,10 +565,8 @@ static int bt3c_open(struct bt3c_info *info) /* Load firmware */ err = request_firmware(&firmware, "BT3CPCC.bin", &info->p_dev->dev); - if (err < 0) { - BT_ERR("Firmware request failed"); + if (err) goto error; - } err = bt3c_load_firmware(info, firmware->data, firmware->size); diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index 71ea2a3af293..fd45d5bdcfd8 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c @@ -390,8 +390,6 @@ static int btmrvl_sdio_download_helper(struct btmrvl_sdio_card *card) ret = request_firmware(&fw_helper, card->helper, &card->func->dev); if ((ret < 0) || !fw_helper) { - BT_ERR("request_firmware(helper) failed, error code = %d", - ret); ret = -ENOENT; goto done; } @@ -490,8 +488,6 @@ static int btmrvl_sdio_download_fw_w_helper(struct btmrvl_sdio_card *card) ret = request_firmware(&fw_firmware, card->firmware, &card->func->dev); if ((ret < 0) || !fw_firmware) { - BT_ERR("request_firmware(firmware) failed, error code = %d", - ret); ret = -ENOENT; goto done; } diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c index 8bf70e8c3f79..460b7313c2d5 100644 --- a/drivers/char/dsp56k.c +++ b/drivers/char/dsp56k.c @@ -140,11 +140,8 @@ static int dsp56k_upload(u_char __user *bin, int len) } err = request_firmware(&fw, fw_name, &pdev->dev); platform_device_unregister(pdev); - if (err) { - printk(KERN_ERR "Failed to load image \"%s\" err %d\n", - fw_name, err); + if (err) return err; - } if (fw->size % 3) { printk(KERN_ERR "Bogus length %d in image \"%s\"\n", fw->size, fw_name); diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 0f6fd42f55ca..7c8276aa7318 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -1408,11 +1408,8 @@ static void sdma_load_firmware(const struct firmware *fw, void *context) const struct sdma_script_start_addrs *addr; unsigned short *ram_code; - if (!fw) { - dev_info(sdma->dev, "external firmware not found, using ROM firmware\n"); - /* In this case we just use the ROM firmware. */ + if (!fw) return; - } if (fw->size < sizeof(*header)) goto err_firmware; diff --git a/drivers/gpu/drm/mga/mga_warp.c b/drivers/gpu/drm/mga/mga_warp.c index 0b76352260a9..06953a711525 100644 --- a/drivers/gpu/drm/mga/mga_warp.c +++ b/drivers/gpu/drm/mga/mga_warp.c @@ -79,11 +79,8 @@ int mga_warp_install_microcode(drm_mga_private_t *dev_priv) } rc = request_ihex_firmware(&fw, firmware_name, &pdev->dev); platform_device_unregister(pdev); - if (rc) { - DRM_ERROR("mga: Failed to load microcode \"%s\"\n", - firmware_name); + if (rc) return rc; - } size = 0; where = 0; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c index 9f5dfc85147a..70ae65c00342 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c @@ -1646,10 +1646,8 @@ gf100_gr_ctor_fw(struct gf100_gr *gr, const char *fwname, snprintf(f, sizeof(f), "nvidia/%s/%s.bin", cname, fwname); ret = request_firmware(&fw, f, device->dev); - if (ret) { - nvkm_error(subdev, "failed to load %s\n", fwname); + if (ret) return ret; - } fuc->size = fw->size; fuc->data = kmemdup(fw->data, fuc->size, GFP_KERNEL); diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c index 14fd83b5f497..0b1c549b49b9 100644 --- a/drivers/gpu/drm/r128/r128_cce.c +++ b/drivers/gpu/drm/r128/r128_cce.c @@ -154,11 +154,8 @@ static int r128_cce_load_microcode(drm_r128_private_t *dev_priv) } rc = request_firmware(&fw, FIRMWARE_NAME, &pdev->dev); platform_device_unregister(pdev); - if (rc) { - printk(KERN_ERR "r128_cce: Failed to load firmware \"%s\"\n", - FIRMWARE_NAME); + if (rc) return rc; - } if (fw->size != 256 * 8) { printk(KERN_ERR diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 158872eb78e4..81e5d31109dd 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c @@ -837,10 +837,6 @@ int ni_init_microcode(struct radeon_device *rdev) out: if (err) { - if (err != -EINVAL) - printk(KERN_ERR - "ni_cp: Failed to load firmware \"%s\"\n", - fw_name); release_firmware(rdev->pfp_fw); rdev->pfp_fw = NULL; release_firmware(rdev->me_fw); diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 9e7e2bf03b81..f5fdf815fe44 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -1039,10 +1039,7 @@ static int r100_cp_init_microcode(struct radeon_device *rdev) } err = request_firmware(&rdev->me_fw, fw_name, rdev->dev); - if (err) { - printk(KERN_ERR "radeon_cp: Failed to load firmware \"%s\"\n", - fw_name); - } else if (rdev->me_fw->size % 8) { + if (err == 0 && rdev->me_fw->size % 8) { printk(KERN_ERR "radeon_cp: Bogus length %zu in firmware \"%s\"\n", rdev->me_fw->size, fw_name); diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index cc2fdf0be37a..7c0ec5314396 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -2592,10 +2592,6 @@ int r600_init_microcode(struct radeon_device *rdev) out: if (err) { - if (err != -EINVAL) - printk(KERN_ERR - "r600_cp: Failed to load firmware \"%s\"\n", - fw_name); release_firmware(rdev->pfp_fw); rdev->pfp_fw = NULL; release_firmware(rdev->me_fw); diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c index e231eeafef23..4556f3b8906f 100644 --- a/drivers/gpu/drm/radeon/r600_cp.c +++ b/drivers/gpu/drm/radeon/r600_cp.c @@ -376,10 +376,6 @@ out: platform_device_unregister(pdev); if (err) { - if (err != -EINVAL) - printk(KERN_ERR - "r600_cp: Failed to load firmware \"%s\"\n", - fw_name); release_firmware(dev_priv->pfp_fw); dev_priv->pfp_fw = NULL; release_firmware(dev_priv->me_fw); diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c index 500287eff55d..5e4af1a716e9 100644 --- a/drivers/gpu/drm/radeon/radeon_cp.c +++ b/drivers/gpu/drm/radeon/radeon_cp.c @@ -530,10 +530,7 @@ static int radeon_cp_init_microcode(drm_radeon_private_t *dev_priv) err = request_firmware(&dev_priv->me_fw, fw_name, &pdev->dev); platform_device_unregister(pdev); - if (err) { - printk(KERN_ERR "radeon_cp: Failed to load firmware \"%s\"\n", - fw_name); - } else if (dev_priv->me_fw->size % 8) { + if (err == 0 && dev_priv->me_fw->size % 8) { printk(KERN_ERR "radeon_cp: Bogus length %zu in firmware \"%s\"\n", dev_priv->me_fw->size, fw_name); diff --git a/drivers/infiniband/hw/qib/qib_sd7220.c b/drivers/infiniband/hw/qib/qib_sd7220.c index c72775f27212..f41f076d583b 100644 --- a/drivers/infiniband/hw/qib/qib_sd7220.c +++ b/drivers/infiniband/hw/qib/qib_sd7220.c @@ -406,10 +406,8 @@ int qib_sd7220_init(struct qib_devdata *dd) } ret = request_firmware(&fw, SD7220_FW_NAME, &dd->pcidev->dev); - if (ret) { - qib_dev_err(dd, "Failed to load IB SERDES image\n"); + if (ret) goto done; - } /* Substitute our deduced value for was_reset */ ret = qib_ibsd_ucode_loaded(dd->pport, fw); diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 2d5794ec338b..85f2f2085019 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -2209,10 +2209,8 @@ static int mxt_load_fw(struct device *dev, const char *fn) int ret; ret = request_firmware(&fw, fn, dev); - if (ret) { - dev_err(dev, "Unable to open firmware %s\n", fn); + if (ret) return ret; - } /* Check for incorrect enc file */ ret = mxt_check_firmware_format(dev, fw); diff --git a/drivers/isdn/hardware/mISDN/speedfax.c b/drivers/isdn/hardware/mISDN/speedfax.c index 9815bb4eec9c..73855b53aeb9 100644 --- a/drivers/isdn/hardware/mISDN/speedfax.c +++ b/drivers/isdn/hardware/mISDN/speedfax.c @@ -392,11 +392,8 @@ setup_instance(struct sfax_hw *card) card->isar.owner = THIS_MODULE; err = request_firmware(&firmware, "isdn/ISAR.BIN", &card->pdev->dev); - if (err < 0) { - pr_info("%s: firmware request failed %d\n", - card->name, err); + if (err) goto error_fw; - } if (debug & DEBUG_HW) pr_notice("%s: got firmware %zu bytes\n", card->name, firmware->size); diff --git a/drivers/media/common/siano/smscoreapi.c b/drivers/media/common/siano/smscoreapi.c index 2a8d9a36d6f0..70316756a8a1 100644 --- a/drivers/media/common/siano/smscoreapi.c +++ b/drivers/media/common/siano/smscoreapi.c @@ -1162,10 +1162,8 @@ static int smscore_load_firmware_from_file(struct smscore_device_t *coredev, return -EINVAL; rc = request_firmware(&fw, fw_filename, coredev->device); - if (rc < 0) { - pr_err("failed to open firmware file '%s'\n", fw_filename); + if (rc) return rc; - } pr_debug("read fw %s, buffer size=0x%zx\n", fw_filename, fw->size); fw_buf = kmalloc(ALIGN(fw->size, SMS_ALLOC_ALIGNMENT), GFP_KERNEL | GFP_DMA); diff --git a/drivers/media/dvb-frontends/af9013.c b/drivers/media/dvb-frontends/af9013.c index e23197da84af..2513f8ceb24c 100644 --- a/drivers/media/dvb-frontends/af9013.c +++ b/drivers/media/dvb-frontends/af9013.c @@ -1376,16 +1376,8 @@ static int af9013_download_firmware(struct af9013_state *state) /* request the firmware, this will block and timeout */ ret = request_firmware(&fw, fw_file, state->i2c->dev.parent); - if (ret) { - dev_info(&state->i2c->dev, "%s: did not find the firmware " \ - "file. (%s) Please see linux/Documentation/dvb/ for " \ - "more details on firmware-problems. (%d)\n", - KBUILD_MODNAME, fw_file, ret); + if (ret) goto err; - } - - dev_info(&state->i2c->dev, "%s: downloading firmware from file '%s'\n", - KBUILD_MODNAME, fw_file); /* calc checksum */ for (i = 0; i < fw->size; i++) diff --git a/drivers/media/dvb-frontends/bcm3510.c b/drivers/media/dvb-frontends/bcm3510.c index d30275f27644..81879296ab57 100644 --- a/drivers/media/dvb-frontends/bcm3510.c +++ b/drivers/media/dvb-frontends/bcm3510.c @@ -635,10 +635,9 @@ static int bcm3510_download_firmware(struct dvb_frontend* fe) int ret,i; deb_info("requesting firmware\n"); - if ((ret = st->config->request_firmware(fe, &fw, BCM3510_DEFAULT_FIRMWARE)) < 0) { - err("could not load firmware (%s): %d",BCM3510_DEFAULT_FIRMWARE,ret); + ret = st->config->request_firmware(fe, &fw, BCM3510_DEFAULT_FIRMWARE); + if (ret) return ret; - } deb_info("got firmware: %zu\n", fw->size); b = fw->data; diff --git a/drivers/media/dvb-frontends/cx24116.c b/drivers/media/dvb-frontends/cx24116.c index 8814f36d53fb..d4020d9c3ac3 100644 --- a/drivers/media/dvb-frontends/cx24116.c +++ b/drivers/media/dvb-frontends/cx24116.c @@ -495,13 +495,8 @@ static int cx24116_firmware_ondemand(struct dvb_frontend *fe) __func__, CX24116_DEFAULT_FIRMWARE); ret = request_firmware(&fw, CX24116_DEFAULT_FIRMWARE, state->i2c->dev.parent); - printk(KERN_INFO "%s: Waiting for firmware upload(2)...\n", - __func__); - if (ret) { - printk(KERN_ERR "%s: No firmware uploaded " - "(timeout or file not found?)\n", __func__); + if (ret) return ret; - } /* Make sure we don't recurse back through here * during loading */ diff --git a/drivers/media/dvb-frontends/drxd_hard.c b/drivers/media/dvb-frontends/drxd_hard.c index 445a15c2714f..0bf80f8003d7 100644 --- a/drivers/media/dvb-frontends/drxd_hard.c +++ b/drivers/media/dvb-frontends/drxd_hard.c @@ -905,10 +905,8 @@ static int load_firmware(struct drxd_state *state, const char *fw_name) { const struct firmware *fw; - if (request_firmware(&fw, fw_name, state->dev) < 0) { - printk(KERN_ERR "drxd: firmware load failure [%s]\n", fw_name); + if (request_firmware(&fw, fw_name, state->dev)) return -EIO; - } state->microcode = kmemdup(fw->data, fw->size, GFP_KERNEL); if (state->microcode == NULL) { diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c index b975da099929..2e1ac411d07d 100644 --- a/drivers/media/dvb-frontends/drxk_hard.c +++ b/drivers/media/dvb-frontends/drxk_hard.c @@ -6284,10 +6284,6 @@ static void load_firmware_cb(const struct firmware *fw, dprintk(1, ": %s\n", fw ? "firmware loaded" : "firmware not loaded"); if (!fw) { - pr_err("Could not load firmware file %s.\n", - state->microcode_name); - pr_info("Copy %s to your hotplug directory!\n", - state->microcode_name); state->microcode_name = NULL; /* diff --git a/drivers/media/dvb-frontends/ds3000.c b/drivers/media/dvb-frontends/ds3000.c index e8fc0329ea64..6874a87f93ee 100644 --- a/drivers/media/dvb-frontends/ds3000.c +++ b/drivers/media/dvb-frontends/ds3000.c @@ -362,12 +362,8 @@ static int ds3000_firmware_ondemand(struct dvb_frontend *fe) DS3000_DEFAULT_FIRMWARE); ret = request_firmware(&fw, DS3000_DEFAULT_FIRMWARE, state->i2c->dev.parent); - printk(KERN_INFO "%s: Waiting for firmware upload(2)...\n", __func__); - if (ret) { - printk(KERN_ERR "%s: No firmware uploaded (timeout or file not " - "found?)\n", __func__); + if (ret) return ret; - } ret = ds3000_load_firmware(fe, fw); if (ret) diff --git a/drivers/media/dvb-frontends/nxt200x.c b/drivers/media/dvb-frontends/nxt200x.c index 79c3040912ab..c659e4cbaac5 100644 --- a/drivers/media/dvb-frontends/nxt200x.c +++ b/drivers/media/dvb-frontends/nxt200x.c @@ -891,12 +891,8 @@ static int nxt2002_init(struct dvb_frontend* fe) __func__, NXT2002_DEFAULT_FIRMWARE); ret = request_firmware(&fw, NXT2002_DEFAULT_FIRMWARE, state->i2c->dev.parent); - pr_debug("%s: Waiting for firmware upload(2)...\n", __func__); - if (ret) { - pr_err("%s: No firmware uploaded (timeout or file not found?)" - "\n", __func__); + if (ret) return ret; - } ret = nxt2002_load_firmware(fe, fw); release_firmware(fw); @@ -958,12 +954,8 @@ static int nxt2004_init(struct dvb_frontend* fe) __func__, NXT2004_DEFAULT_FIRMWARE); ret = request_firmware(&fw, NXT2004_DEFAULT_FIRMWARE, state->i2c->dev.parent); - pr_debug("%s: Waiting for firmware upload(2)...\n", __func__); - if (ret) { - pr_err("%s: No firmware uploaded (timeout or file not found?)" - "\n", __func__); + if (ret) return ret; - } ret = nxt2004_load_firmware(fe, fw); release_firmware(fw); diff --git a/drivers/media/dvb-frontends/or51132.c b/drivers/media/dvb-frontends/or51132.c index 35b1053b3640..1ad111648298 100644 --- a/drivers/media/dvb-frontends/or51132.c +++ b/drivers/media/dvb-frontends/or51132.c @@ -341,11 +341,8 @@ static int or51132_set_parameters(struct dvb_frontend *fe) printk("or51132: Waiting for firmware upload(%s)...\n", fwname); ret = request_firmware(&fw, fwname, state->i2c->dev.parent); - if (ret) { - printk(KERN_WARNING "or51132: No firmware up" - "loaded(timeout or file not found?)\n"); + if (ret) return ret; - } ret = or51132_load_firmware(fe, fw); release_firmware(fw); if (ret) { diff --git a/drivers/media/dvb-frontends/or51211.c b/drivers/media/dvb-frontends/or51211.c index e82413b975e6..1d89fe8dcba1 100644 --- a/drivers/media/dvb-frontends/or51211.c +++ b/drivers/media/dvb-frontends/or51211.c @@ -375,12 +375,8 @@ static int or51211_init(struct dvb_frontend* fe) OR51211_DEFAULT_FIRMWARE); ret = config->request_firmware(fe, &fw, OR51211_DEFAULT_FIRMWARE); - pr_info("Got Hotplug firmware\n"); - if (ret) { - pr_warn("No firmware uploaded " - "(timeout or file not found?)\n"); + if (ret) return ret; - } ret = or51211_load_firmware(fe, fw); release_firmware(fw); diff --git a/drivers/media/dvb-frontends/sp8870.c b/drivers/media/dvb-frontends/sp8870.c index e87ac30d7fb8..366326e7b305 100644 --- a/drivers/media/dvb-frontends/sp8870.c +++ b/drivers/media/dvb-frontends/sp8870.c @@ -315,10 +315,8 @@ static int sp8870_init (struct dvb_frontend* fe) /* request the firmware, this will block until someone uploads it */ printk("sp8870: waiting for firmware upload (%s)...\n", SP8870_DEFAULT_FIRMWARE); - if (state->config->request_firmware(fe, &fw, SP8870_DEFAULT_FIRMWARE)) { - printk("sp8870: no firmware upload (timeout or file not found?)\n"); + if (state->config->request_firmware(fe, &fw, SP8870_DEFAULT_FIRMWARE)) return -EIO; - } if (sp8870_firmware_upload(state, fw)) { printk("sp8870: writing firmware to device failed\n"); diff --git a/drivers/media/dvb-frontends/sp887x.c b/drivers/media/dvb-frontends/sp887x.c index 4378fe1b978e..672db3f29eeb 100644 --- a/drivers/media/dvb-frontends/sp887x.c +++ b/drivers/media/dvb-frontends/sp887x.c @@ -527,10 +527,8 @@ static int sp887x_init(struct dvb_frontend* fe) /* request the firmware, this will block until someone uploads it */ printk("sp887x: waiting for firmware upload (%s)...\n", SP887X_DEFAULT_FIRMWARE); ret = state->config->request_firmware(fe, &fw, SP887X_DEFAULT_FIRMWARE); - if (ret) { - printk("sp887x: no firmware upload (timeout or file not found?)\n"); + if (ret) return ret; - } ret = sp887x_initial_setup(fe, fw); release_firmware(fw); diff --git a/drivers/media/dvb-frontends/tda10048.c b/drivers/media/dvb-frontends/tda10048.c index 8451086c563f..489103e91a40 100644 --- a/drivers/media/dvb-frontends/tda10048.c +++ b/drivers/media/dvb-frontends/tda10048.c @@ -495,8 +495,6 @@ static int tda10048_firmware_upload(struct dvb_frontend *fe) ret = request_firmware(&fw, TDA10048_DEFAULT_FIRMWARE, state->i2c->dev.parent); if (ret) { - printk(KERN_ERR "%s: Upload failed. (file not found?)\n", - __func__); return -EIO; } else { printk(KERN_INFO "%s: firmware read %Zu bytes.\n", diff --git a/drivers/media/dvb-frontends/tda1004x.c b/drivers/media/dvb-frontends/tda1004x.c index c6abeb4fba9d..86a53d4e602e 100644 --- a/drivers/media/dvb-frontends/tda1004x.c +++ b/drivers/media/dvb-frontends/tda1004x.c @@ -401,10 +401,8 @@ static int tda10045_fwupload(struct dvb_frontend* fe) /* request the firmware, this will block until someone uploads it */ printk(KERN_INFO "tda1004x: waiting for firmware upload (%s)...\n", TDA10045_DEFAULT_FIRMWARE); ret = state->config->request_firmware(fe, &fw, TDA10045_DEFAULT_FIRMWARE); - if (ret) { - printk(KERN_ERR "tda1004x: no firmware upload (timeout or file not found?)\n"); + if (ret) return ret; - } /* reset chip */ tda1004x_write_mask(state, TDA1004X_CONFC4, 0x10, 0); @@ -545,7 +543,6 @@ static int tda10046_fwupload(struct dvb_frontend* fe) /* remain compatible to old bug: try to load with tda10045 image name */ ret = state->config->request_firmware(fe, &fw, TDA10045_DEFAULT_FIRMWARE); if (ret) { - printk(KERN_ERR "tda1004x: no firmware upload (timeout or file not found?)\n"); return ret; } else { printk(KERN_INFO "tda1004x: please rename the firmware file to %s\n", diff --git a/drivers/media/dvb-frontends/tda10071.c b/drivers/media/dvb-frontends/tda10071.c index 119d47596ac8..3eb16251c286 100644 --- a/drivers/media/dvb-frontends/tda10071.c +++ b/drivers/media/dvb-frontends/tda10071.c @@ -850,12 +850,8 @@ static int tda10071_init(struct dvb_frontend *fe) /* request the firmware, this will block and timeout */ ret = request_firmware(&fw, fw_file, &client->dev); - if (ret) { - dev_err(&client->dev, - "did not find the firmware file. (%s) Please see linux/Documentation/dvb/ for more details on firmware-problems. (%d)\n", - fw_file, ret); + if (ret) goto error; - } /* init */ for (i = 0; i < ARRAY_SIZE(tab2); i++) { diff --git a/drivers/media/i2c/cx25840/cx25840-firmware.c b/drivers/media/i2c/cx25840/cx25840-firmware.c index 9bbb31adc29d..5477d5fe420b 100644 --- a/drivers/media/i2c/cx25840/cx25840-firmware.c +++ b/drivers/media/i2c/cx25840/cx25840-firmware.c @@ -126,10 +126,8 @@ int cx25840_loadfw(struct i2c_client *client) if (is_cx231xx(state) && max_buf_size > 16) max_buf_size = 16; - if (request_firmware(&fw, fwname, FWDEV(client)) != 0) { - v4l_err(client, "unable to open firmware %s\n", fwname); + if (request_firmware(&fw, fwname, FWDEV(client)) != 0) return -EINVAL; - } start_fw_load(client); diff --git a/drivers/media/pci/bt8xx/bttv-cards.c b/drivers/media/pci/bt8xx/bttv-cards.c index 4654fb65ca21..c3db24522261 100644 --- a/drivers/media/pci/bt8xx/bttv-cards.c +++ b/drivers/media/pci/bt8xx/bttv-cards.c @@ -3912,10 +3912,8 @@ static int pvr_boot(struct bttv *btv) int rc; rc = request_firmware(&fw_entry, "hcwamc.rbf", &btv->c.pci->dev); - if (rc != 0) { - pr_warn("%d: no altera firmware [via hotplug]\n", btv->c.nr); + if (rc != 0) return rc; - } rc = pvr_altera_load(btv, fw_entry->data, fw_entry->size); pr_info("%d: altera firmware upload %s\n", btv->c.nr, (rc < 0) ? "failed" : "ok"); diff --git a/drivers/media/pci/cx18/cx18-av-firmware.c b/drivers/media/pci/cx18/cx18-av-firmware.c index a34fd082b76e..33067ae05d62 100644 --- a/drivers/media/pci/cx18/cx18-av-firmware.c +++ b/drivers/media/pci/cx18/cx18-av-firmware.c @@ -85,10 +85,8 @@ int cx18_av_loadfw(struct cx18 *cx) int i; int retries1 = 0; - if (request_firmware(&fw, FWFILE, &cx->pci_dev->dev) != 0) { - CX18_ERR_DEV(sd, "unable to open firmware %s\n", FWFILE); + if (request_firmware(&fw, FWFILE, &cx->pci_dev->dev) != 0) return -EINVAL; - } /* The firmware load often has byte errors, so allow for several retries, both at byte level and at the firmware load level. */ diff --git a/drivers/media/pci/cx18/cx18-dvb.c b/drivers/media/pci/cx18/cx18-dvb.c index 3eac59c51231..da4aac9d2175 100644 --- a/drivers/media/pci/cx18/cx18-dvb.c +++ b/drivers/media/pci/cx18/cx18-dvb.c @@ -141,9 +141,7 @@ static int yuan_mpc718_mt352_reqfw(struct cx18_stream *stream, int ret; ret = request_firmware(fw, fn, &cx->pci_dev->dev); - if (ret) - CX18_ERR("Unable to open firmware file %s\n", fn); - else { + if (!ret) { size_t sz = (*fw)->size; if (sz < 2 || sz > 64 || (sz % 2) != 0) { CX18_ERR("Firmware %s has a bad size: %lu bytes\n", @@ -156,7 +154,7 @@ static int yuan_mpc718_mt352_reqfw(struct cx18_stream *stream, if (ret) { CX18_ERR("The MPC718 board variant with the MT352 DVB-T" - "demodualtor will not work without it\n"); + "demodulator will not work without firmware\n"); CX18_ERR("Run 'linux/Documentation/dvb/get_dvb_firmware " "mpc718' if you need the firmware\n"); } diff --git a/drivers/media/pci/cx18/cx18-firmware.c b/drivers/media/pci/cx18/cx18-firmware.c index c6c83445f8bf..bc24466ffcba 100644 --- a/drivers/media/pci/cx18/cx18-firmware.c +++ b/drivers/media/pci/cx18/cx18-firmware.c @@ -106,11 +106,8 @@ static int load_cpu_fw_direct(const char *fn, u8 __iomem *mem, struct cx18 *cx) u32 __iomem *dst = (u32 __iomem *)mem; const u32 *src; - if (request_firmware(&fw, fn, &cx->pci_dev->dev)) { - CX18_ERR("Unable to open firmware %s\n", fn); - CX18_ERR("Did you put the firmware in the hotplug firmware directory?\n"); + if (request_firmware(&fw, fn, &cx->pci_dev->dev)) return -ENOMEM; - } src = (const u32 *)fw->data; @@ -151,8 +148,6 @@ static int load_apu_fw_direct(const char *fn, u8 __iomem *dst, struct cx18 *cx, int sz; if (request_firmware(&fw, fn, &cx->pci_dev->dev)) { - CX18_ERR("unable to open firmware %s\n", fn); - CX18_ERR("did you put the firmware in the hotplug firmware directory?\n"); cx18_setup_page(cx, 0); return -ENOMEM; } diff --git a/drivers/media/pci/cx23885/cx23885-417.c b/drivers/media/pci/cx23885/cx23885-417.c index 88a3afb66d10..343e893c547b 100644 --- a/drivers/media/pci/cx23885/cx23885-417.c +++ b/drivers/media/pci/cx23885/cx23885-417.c @@ -931,14 +931,8 @@ static int cx23885_load_firmware(struct cx23885_dev *dev) retval = request_firmware(&firmware, CX23885_FIRM_IMAGE_NAME, &dev->pci->dev); - if (retval != 0) { - printk(KERN_ERR - "ERROR: Hotplug firmware request failed (%s).\n", - CX23885_FIRM_IMAGE_NAME); - printk(KERN_ERR "Please fix your hotplug setup, the board will " - "not work without firmware loaded!\n"); + if (retval != 0) return -1; - } if (firmware->size != CX23885_FIRM_IMAGE_SIZE) { printk(KERN_ERR "ERROR: Firmware size mismatch " diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c index f384f295676e..6186274a6acf 100644 --- a/drivers/media/pci/cx23885/cx23885-cards.c +++ b/drivers/media/pci/cx23885/cx23885-cards.c @@ -2165,11 +2165,7 @@ void cx23885_card_setup(struct cx23885_dev *dev) cinfo.rev, filename); ret = request_firmware(&fw, filename, &dev->pci->dev); - if (ret != 0) - printk(KERN_ERR "did not find the firmware file. (%s) " - "Please see linux/Documentation/dvb/ for more details " - "on firmware-problems.", filename); - else + if (ret == 0) altera_init(&netup_config, fw); release_firmware(fw); diff --git a/drivers/media/pci/cx88/cx88-blackbird.c b/drivers/media/pci/cx88/cx88-blackbird.c index 8b889135be8a..807623595310 100644 --- a/drivers/media/pci/cx88/cx88-blackbird.c +++ b/drivers/media/pci/cx88/cx88-blackbird.c @@ -444,12 +444,8 @@ static int blackbird_load_firmware(struct cx8802_dev *dev) &dev->pci->dev); - if (retval != 0) { - pr_err("Hotplug firmware request failed (%s).\n", - CX2341X_FIRM_ENC_FILENAME); - pr_err("Please fix your hotplug setup, the board will not work without firmware loaded!\n"); + if (retval != 0) return -EIO; - } if (firmware->size != BLACKBIRD_FIRM_IMAGE_SIZE) { pr_err("Firmware size mismatch (have %zd, expected %d)\n", diff --git a/drivers/media/pci/ivtv/ivtv-firmware.c b/drivers/media/pci/ivtv/ivtv-firmware.c index 4b0e758a7bce..d24ac02b36a3 100644 --- a/drivers/media/pci/ivtv/ivtv-firmware.c +++ b/drivers/media/pci/ivtv/ivtv-firmware.c @@ -80,8 +80,6 @@ retry: release_firmware(fw); return size; } - IVTV_ERR("Unable to open firmware %s (must be %ld bytes)\n", fn, size); - IVTV_ERR("Did you put the firmware in the hotplug firmware directory?\n"); return -ENOMEM; } diff --git a/drivers/media/pci/ngene/ngene-core.c b/drivers/media/pci/ngene/ngene-core.c index 1b92d836a564..02d417135d15 100644 --- a/drivers/media/pci/ngene/ngene-core.c +++ b/drivers/media/pci/ngene/ngene-core.c @@ -1260,13 +1260,8 @@ static int ngene_load_firm(struct ngene *dev) break; } - if (request_firmware(&fw, fw_name, &dev->pci_dev->dev) < 0) { - printk(KERN_ERR DEVICE_NAME - ": Could not load firmware file %s.\n", fw_name); - printk(KERN_INFO DEVICE_NAME - ": Copy %s to your hotplug directory!\n", fw_name); + if (request_firmware(&fw, fw_name, &dev->pci_dev->dev)) return -1; - } if (size == 0) size = fw->size; if (size != fw->size) { @@ -1274,8 +1269,6 @@ static int ngene_load_firm(struct ngene *dev) ": Firmware %s has invalid size!", fw_name); err = -1; } else { - printk(KERN_INFO DEVICE_NAME - ": Loading firmware file %s.\n", fw_name); ngene_fw = (u8 *) fw->data; err = ngene_command_load_firmware(dev, ngene_fw, size); } diff --git a/drivers/media/pci/saa7164/saa7164-fw.c b/drivers/media/pci/saa7164/saa7164-fw.c index 269e0782c7b6..2e0dacb0e70d 100644 --- a/drivers/media/pci/saa7164/saa7164-fw.c +++ b/drivers/media/pci/saa7164/saa7164-fw.c @@ -420,11 +420,8 @@ int saa7164_downloadfirmware(struct saa7164_dev *dev) __func__, fwname); ret = request_firmware(&fw, fwname, &dev->pci->dev); - if (ret) { - printk(KERN_ERR "%s() Upload failed. " - "(file not found?)\n", __func__); + if (ret) return -ENOMEM; - } printk(KERN_INFO "%s() firmware read %Zu bytes.\n", __func__, fw->size); diff --git a/drivers/media/pci/ttpci/av7110.c b/drivers/media/pci/ttpci/av7110.c index f89364951ebd..5fd33be501db 100644 --- a/drivers/media/pci/ttpci/av7110.c +++ b/drivers/media/pci/ttpci/av7110.c @@ -1531,16 +1531,9 @@ static int get_firmware(struct av7110* av7110) /* request the av7110 firmware, this will block until someone uploads it */ ret = request_firmware(&fw, "dvb-ttpci-01.fw", &av7110->dev->pci->dev); if (ret) { - if (ret == -ENOENT) { - printk(KERN_ERR "dvb-ttpci: could not load firmware," - " file not found: dvb-ttpci-01.fw\n"); - printk(KERN_ERR "dvb-ttpci: usually this should be in " - "/usr/lib/hotplug/firmware or /lib/firmware\n"); - printk(KERN_ERR "dvb-ttpci: and can be downloaded from" + if (ret == -ENOENT) + printk(KERN_ERR "dvb-ttpci: firmware can be downloaded from" " http://www.linuxtv.org/download/dvb/firmware/\n"); - } else - printk(KERN_ERR "dvb-ttpci: cannot request firmware" - " (error %i)\n", ret); return -EINVAL; } diff --git a/drivers/media/pci/ttpci/av7110_hw.c b/drivers/media/pci/ttpci/av7110_hw.c index 300bd3c94738..451add105e20 100644 --- a/drivers/media/pci/ttpci/av7110_hw.c +++ b/drivers/media/pci/ttpci/av7110_hw.c @@ -251,11 +251,8 @@ int av7110_bootarm(struct av7110 *av7110) //saa7146_setgpio(dev, 3, SAA7146_GPIO_INPUT); ret = request_firmware(&fw, fw_name, &dev->pci->dev); - if (ret) { - printk(KERN_ERR "dvb-ttpci: Failed to load firmware \"%s\"\n", - fw_name); + if (ret) return ret; - } mwdebi(av7110, DEBISWAB, DPRAM_BASE, fw->data, fw->size); release_firmware(fw); diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c index 40d8a03a141d..e317a30fb9ea 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c @@ -95,10 +95,8 @@ int s5p_mfc_load_firmware(struct s5p_mfc_dev *dev) } } - if (err != 0) { - mfc_err("Firmware is not present in the /lib/firmware directory nor compiled in kernel\n"); + if (err != 0) return -EINVAL; - } if (fw_blob->size > dev->fw_size) { mfc_err("MFC firmware is too big to be loaded\n"); release_firmware(fw_blob); diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c index a93f681aa9d6..0526624e257c 100644 --- a/drivers/media/radio/radio-wl1273.c +++ b/drivers/media/radio/radio-wl1273.c @@ -514,11 +514,8 @@ static int wl1273_fm_upload_firmware_patch(struct wl1273_device *radio) * Uploading the firmware patch is not always necessary, * so we only print an info message. */ - if (request_firmware(&fw_p, fw_name, dev)) { - dev_info(dev, "%s - %s not found\n", __func__, fw_name); - + if (request_firmware(&fw_p, fw_name, dev)) return 0; - } ptr = (__u8 *) fw_p->data; packet_num = ptr[0]; diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c index ebc73b034249..2de3563165d7 100644 --- a/drivers/media/radio/wl128x/fmdrv_common.c +++ b/drivers/media/radio/wl128x/fmdrv_common.c @@ -1249,10 +1249,8 @@ static int fm_download_firmware(struct fmdev *fmdev, const u8 *fw_name) ret = request_firmware(&fw_entry, fw_name, &fmdev->radio_dev->dev); - if (ret < 0) { - fmerr("Unable to read firmware(%s) content\n", fw_name); + if (ret) return ret; - } fmdbg("Firmware(%s) length : %zu bytes\n", fw_name, fw_entry->size); fw_data = (void *)fw_entry->data; diff --git a/drivers/media/tuners/tuner-xc2028.c b/drivers/media/tuners/tuner-xc2028.c index 4e941f00b600..1e9132e0f75b 100644 --- a/drivers/media/tuners/tuner-xc2028.c +++ b/drivers/media/tuners/tuner-xc2028.c @@ -1373,7 +1373,6 @@ static void load_firmware_cb(const struct firmware *fw, tuner_dbg("request_firmware_nowait(): %s\n", fw ? "OK" : "error"); if (!fw) { - tuner_err("Could not load firmware %s.\n", priv->fname); priv->state = XC2028_NODEV; return; } diff --git a/drivers/media/usb/cpia2/cpia2_core.c b/drivers/media/usb/cpia2/cpia2_core.c index 187012ce444b..2334be8cf887 100644 --- a/drivers/media/usb/cpia2/cpia2_core.c +++ b/drivers/media/usb/cpia2/cpia2_core.c @@ -907,11 +907,8 @@ static int apply_vp_patch(struct camera_data *cam) struct cpia2_command cmd; ret = request_firmware(&fw, fw_name, &cam->dev->dev); - if (ret) { - printk(KERN_ERR "cpia2: failed to load VP patch \"%s\"\n", - fw_name); + if (ret) return ret; - } cmd.req_mode = CAMERAACCESS_TYPE_REPEAT | CAMERAACCESS_VP; cmd.direction = TRANSFER_WRITE; diff --git a/drivers/media/usb/cx231xx/cx231xx-417.c b/drivers/media/usb/cx231xx/cx231xx-417.c index 47a98a2014a5..14d01b3a0775 100644 --- a/drivers/media/usb/cx231xx/cx231xx-417.c +++ b/drivers/media/usb/cx231xx/cx231xx-417.c @@ -995,14 +995,8 @@ static int cx231xx_load_firmware(struct cx231xx *dev) retval = request_firmware(&firmware, CX231xx_FIRM_IMAGE_NAME, dev->dev); - if (retval != 0) { - dev_err(dev->dev, - "ERROR: Hotplug firmware request failed (%s).\n", - CX231xx_FIRM_IMAGE_NAME); - dev_err(dev->dev, - "Please fix your hotplug setup, the board will not work without firmware loaded!\n"); + if (retval != 0) return -1; - } if (firmware->size != CX231xx_FIRM_IMAGE_SIZE) { dev_err(dev->dev, diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c index 7ed49646a699..990d80aa94b9 100644 --- a/drivers/media/usb/dvb-usb/dib0700_devices.c +++ b/drivers/media/usb/dvb-usb/dib0700_devices.c @@ -2391,12 +2391,9 @@ static int stk9090m_frontend_attach(struct dvb_usb_adapter *adap) dib9000_i2c_enumeration(&adap->dev->i2c_adap, 1, 0x10, 0x80); - if (request_firmware(&state->frontend_firmware, "dib9090.fw", &adap->dev->udev->dev)) { - deb_info("%s: Upload failed. (file not found?)\n", __func__); + if (request_firmware(&state->frontend_firmware, "dib9090.fw", &adap->dev->udev->dev)) return -ENODEV; - } else { - deb_info("%s: firmware read %Zu bytes.\n", __func__, state->frontend_firmware->size); - } + deb_info("%s: firmware read %Zu bytes.\n", __func__, state->frontend_firmware->size); stk9090m_config.microcode_B_fe_size = state->frontend_firmware->size; stk9090m_config.microcode_B_fe_buffer = state->frontend_firmware->data; @@ -2457,12 +2454,9 @@ static int nim9090md_frontend_attach(struct dvb_usb_adapter *adap) msleep(20); dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1); - if (request_firmware(&state->frontend_firmware, "dib9090.fw", &adap->dev->udev->dev)) { - deb_info("%s: Upload failed. (file not found?)\n", __func__); + if (request_firmware(&state->frontend_firmware, "dib9090.fw", &adap->dev->udev->dev)) return -EIO; - } else { - deb_info("%s: firmware read %Zu bytes.\n", __func__, state->frontend_firmware->size); - } + deb_info("%s: firmware read %Zu bytes.\n", __func__, state->frontend_firmware->size); nim9090md_config[0].microcode_B_fe_size = state->frontend_firmware->size; nim9090md_config[0].microcode_B_fe_buffer = state->frontend_firmware->data; nim9090md_config[1].microcode_B_fe_size = state->frontend_firmware->size; diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c index 733a7ff7b207..a4e18ec1f920 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c @@ -80,14 +80,9 @@ int dvb_usb_download_firmware(struct usb_device *udev, struct dvb_usb_device_pro int ret; const struct firmware *fw = NULL; - if ((ret = request_firmware(&fw, props->firmware, &udev->dev)) != 0) { - err("did not find the firmware file. (%s) " - "Please see linux/Documentation/dvb/ for more details on firmware-problems. (%d)", - props->firmware,ret); + ret = request_firmware(&fw, props->firmware, &udev->dev); + if (ret) return ret; - } - - info("downloading firmware from file '%s'",props->firmware); switch (props->usb_ctrl) { case CYPRESS_AN2135: diff --git a/drivers/media/usb/dvb-usb/gp8psk.c b/drivers/media/usb/dvb-usb/gp8psk.c index 5d0384dd45b5..f9c2b203eea2 100644 --- a/drivers/media/usb/dvb-usb/gp8psk.c +++ b/drivers/media/usb/dvb-usb/gp8psk.c @@ -116,20 +116,14 @@ static int gp8psk_load_bcm4500fw(struct dvb_usb_device *d) const u8 *ptr; u8 *buf; if ((ret = request_firmware(&fw, bcm4500_firmware, - &d->udev->dev)) != 0) { - err("did not find the bcm4500 firmware file. (%s) " - "Please see linux/Documentation/dvb/ for more details on firmware-problems. (%d)", - bcm4500_firmware,ret); + &d->udev->dev)) != 0) return ret; - } ret = -EINVAL; if (gp8psk_usb_out_op(d, LOAD_BCM4500,1,0,NULL, 0)) goto out_rel_fw; - info("downloading bcm4500 firmware from file '%s'",bcm4500_firmware); - ptr = fw->data; buf = kmalloc(64, GFP_KERNEL | GFP_DMA); if (!buf) { diff --git a/drivers/media/usb/dvb-usb/opera1.c b/drivers/media/usb/dvb-usb/opera1.c index 2566d2f1c2ad..4c557bff8aea 100644 --- a/drivers/media/usb/dvb-usb/opera1.c +++ b/drivers/media/usb/dvb-usb/opera1.c @@ -453,9 +453,6 @@ static int opera1_xilinx_load_firmware(struct usb_device *dev, info("start downloading fpga firmware %s",filename); if ((ret = request_firmware(&fw, filename, &dev->dev)) != 0) { - err("did not find the firmware file. (%s) " - "Please see linux/Documentation/dvb/ for more details on firmware-problems.", - filename); return ret; } else { p = kmalloc(fw->size, GFP_KERNEL); diff --git a/drivers/media/usb/go7007/go7007-driver.c b/drivers/media/usb/go7007/go7007-driver.c index ae1cfa792c58..af502724e5d4 100644 --- a/drivers/media/usb/go7007/go7007-driver.c +++ b/drivers/media/usb/go7007/go7007-driver.c @@ -92,10 +92,8 @@ static int go7007_load_encoder(struct go7007 *go) u16 intr_val, intr_data; if (go->boot_fw == NULL) { - if (request_firmware(&fw_entry, fw_name, go->dev)) { - v4l2_err(go, "unable to load firmware from file \"%s\"\n", fw_name); + if (request_firmware(&fw_entry, fw_name, go->dev)) return -1; - } if (fw_entry->size < 16 || memcmp(fw_entry->data, "WISGO7007FW", 11)) { v4l2_err(go, "file \"%s\" does not appear to be go7007 firmware\n", fw_name); release_firmware(fw_entry); diff --git a/drivers/media/usb/go7007/go7007-fw.c b/drivers/media/usb/go7007/go7007-fw.c index 60bf5f0644d1..23dc15d0a716 100644 --- a/drivers/media/usb/go7007/go7007-fw.c +++ b/drivers/media/usb/go7007/go7007-fw.c @@ -1570,12 +1570,8 @@ int go7007_construct_fw_image(struct go7007 *go, u8 **fw, int *fwlen) default: return -1; } - if (request_firmware(&fw_entry, GO7007_FW_NAME, go->dev)) { - dev_err(go->dev, - "unable to load firmware from file \"%s\"\n", - GO7007_FW_NAME); + if (request_firmware(&fw_entry, GO7007_FW_NAME, go->dev)) return -1; - } code = kzalloc(codespace * 2, GFP_KERNEL); if (code == NULL) goto fw_failed; diff --git a/drivers/media/usb/go7007/go7007-loader.c b/drivers/media/usb/go7007/go7007-loader.c index 042f78a31283..5623c5d550a9 100644 --- a/drivers/media/usb/go7007/go7007-loader.c +++ b/drivers/media/usb/go7007/go7007-loader.c @@ -75,11 +75,8 @@ static int go7007_loader_probe(struct usb_interface *interface, dev_info(&interface->dev, "loading firmware %s\n", fw1); - if (request_firmware(&fw, fw1, &usbdev->dev)) { - dev_err(&interface->dev, - "unable to load firmware from file \"%s\"\n", fw1); + if (request_firmware(&fw, fw1, &usbdev->dev)) goto failed2; - } ret = cypress_load_firmware(usbdev, fw, CYPRESS_FX2); release_firmware(fw); if (0 != ret) { @@ -90,11 +87,8 @@ static int go7007_loader_probe(struct usb_interface *interface, if (fw2 == NULL) return 0; - if (request_firmware(&fw, fw2, &usbdev->dev)) { - dev_err(&interface->dev, - "unable to load firmware from file \"%s\"\n", fw2); + if (request_firmware(&fw, fw2, &usbdev->dev)) goto failed2; - } ret = cypress_load_firmware(usbdev, fw, CYPRESS_FX2); release_firmware(fw); if (0 != ret) { diff --git a/drivers/media/usb/gspca/vicam.c b/drivers/media/usb/gspca/vicam.c index 103f6c4236b0..b8a10b58e698 100644 --- a/drivers/media/usb/gspca/vicam.c +++ b/drivers/media/usb/gspca/vicam.c @@ -244,10 +244,8 @@ static int sd_init(struct gspca_dev *gspca_dev) ret = request_ihex_firmware(&fw, VICAM_FIRMWARE, &gspca_dev->dev->dev); - if (ret) { - pr_err("Failed to load \"vicam/firmware.fw\": %d\n", ret); + if (ret) return ret; - } firmware_buf = kmalloc(PAGE_SIZE, GFP_KERNEL); if (!firmware_buf) { diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c index 0533ef20decf..da28f6225dff 100644 --- a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c @@ -1382,29 +1382,6 @@ static int pvr2_locate_firmware(struct pvr2_hdw *hdw, "request_firmware fatal error with code=%d",ret); return ret; } - pvr2_trace(PVR2_TRACE_ERROR_LEGS, - "***WARNING***" - " Device %s firmware" - " seems to be missing.", - fwtypename); - pvr2_trace(PVR2_TRACE_ERROR_LEGS, - "Did you install the pvrusb2 firmware files" - " in their proper location?"); - if (fwcount == 1) { - pvr2_trace(PVR2_TRACE_ERROR_LEGS, - "request_firmware unable to locate %s file %s", - fwtypename,fwnames[0]); - } else { - pvr2_trace(PVR2_TRACE_ERROR_LEGS, - "request_firmware unable to locate" - " one of the following %s files:", - fwtypename); - for (idx = 0; idx < fwcount; idx++) { - pvr2_trace(PVR2_TRACE_ERROR_LEGS, - "request_firmware: Failed to find %s", - fwnames[idx]); - } - } return ret; } diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c index e7acb12ad21d..b6ee8906e7cc 100644 --- a/drivers/media/usb/s2255/s2255drv.c +++ b/drivers/media/usb/s2255/s2255drv.c @@ -2302,10 +2302,8 @@ static int s2255_probe(struct usb_interface *interface, } /* load the first chunk */ if (request_firmware(&dev->fw_data->fw, - FIRMWARE_FILE_NAME, &dev->udev->dev)) { - dev_err(&interface->dev, "sensoray 2255 failed to get firmware\n"); + FIRMWARE_FILE_NAME, &dev->udev->dev)) goto errorREQFW; - } /* check the firmware is valid */ fw_size = dev->fw_data->fw->size; pdata = (__le32 *) &dev->fw_data->fw->data[fw_size - 8]; diff --git a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c index d52d4a8d39ad..4b48545b08e2 100644 --- a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c +++ b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c @@ -296,10 +296,8 @@ static int ttusb_boot_dsp(struct ttusb *ttusb) err = request_firmware(&fw, "ttusb-budget/dspbootcode.bin", &ttusb->dev->dev); - if (err) { - printk(KERN_ERR "ttusb-budget: failed to request firmware\n"); + if (err) return err; - } /* BootBlock */ b[0] = 0xaa; diff --git a/drivers/media/usb/ttusb-dec/ttusb_dec.c b/drivers/media/usb/ttusb-dec/ttusb_dec.c index a5de46f04247..255b2db0ad74 100644 --- a/drivers/media/usb/ttusb-dec/ttusb_dec.c +++ b/drivers/media/usb/ttusb-dec/ttusb_dec.c @@ -1290,11 +1290,8 @@ static int ttusb_dec_boot_dsp(struct ttusb_dec *dec) dprintk("%s\n", __func__); result = request_firmware(&fw_entry, dec->firmware_name, &dec->udev->dev); - if (result) { - printk(KERN_ERR "%s: Firmware (%s) unavailable.\n", - __func__, dec->firmware_name); + if (result) return result; - } firmware = fw_entry->data; firmware_size = fw_entry->size; diff --git a/drivers/misc/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c index 71b64550b591..cee44fbb8962 100644 --- a/drivers/misc/ti-st/st_kim.c +++ b/drivers/misc/ti-st/st_kim.c @@ -303,11 +303,8 @@ static long download_firmware(struct kim_data_s *kim_gdata) request_firmware(&kim_gdata->fw_entry, bts_scr_name, &kim_gdata->kim_pdev->dev); if (unlikely((err != 0) || (kim_gdata->fw_entry->data == NULL) || - (kim_gdata->fw_entry->size == 0))) { - pr_err(" request_firmware failed(errno %ld) for %s", err, - bts_scr_name); + (kim_gdata->fw_entry->size == 0))) return -EINVAL; - } ptr = (void *)kim_gdata->fw_entry->data; len = kim_gdata->fw_entry->size; /* bts_header to remove out magic number and diff --git a/drivers/net/can/softing/softing_fw.c b/drivers/net/can/softing/softing_fw.c index 52fe50725d74..13b5a50c4704 100644 --- a/drivers/net/can/softing/softing_fw.c +++ b/drivers/net/can/softing/softing_fw.c @@ -237,11 +237,8 @@ int softing_load_app_fw(const char *file, struct softing *card) int8_t type_end = 0, type_entrypoint = 0; ret = request_firmware(&fw, file, &card->pdev->dev); - if (ret) { - dev_alert(&card->pdev->dev, "request_firmware(%s) got %i\n", - file, ret); + if (ret) return ret; - } dev_dbg(&card->pdev->dev, "firmware(%s) got %lu bytes\n", file, (unsigned long)fw->size); /* parse the firmware */ diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c index 8f8418d2ac4a..66df9e943ac4 100644 --- a/drivers/net/ethernet/3com/typhoon.c +++ b/drivers/net/ethernet/3com/typhoon.c @@ -1279,11 +1279,8 @@ typhoon_request_firmware(struct typhoon *tp) return 0; err = request_firmware(&typhoon_fw, FIRMWARE_NAME, &tp->pdev->dev); - if (err) { - netdev_err(tp->dev, "Failed to load firmware \"%s\"\n", - FIRMWARE_NAME); + if (err) return err; - } image_data = typhoon_fw->data; remaining = typhoon_fw->size; diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c index ac7288240d55..6771813664a4 100644 --- a/drivers/net/ethernet/adaptec/starfire.c +++ b/drivers/net/ethernet/adaptec/starfire.c @@ -1016,11 +1016,8 @@ static int netdev_open(struct net_device *dev) #endif /* VLAN_SUPPORT */ retval = request_firmware(&fw_rx, FIRMWARE_RX, &np->pci_dev->dev); - if (retval) { - printk(KERN_ERR "starfire: Failed to load firmware \"%s\"\n", - FIRMWARE_RX); + if (retval) goto out_init; - } if (fw_rx->size % 4) { printk(KERN_ERR "starfire: bogus length %zu in \"%s\"\n", fw_rx->size, FIRMWARE_RX); @@ -1028,11 +1025,8 @@ static int netdev_open(struct net_device *dev) goto out_rx; } retval = request_firmware(&fw_tx, FIRMWARE_TX, &np->pci_dev->dev); - if (retval) { - printk(KERN_ERR "starfire: Failed to load firmware \"%s\"\n", - FIRMWARE_TX); + if (retval) goto out_rx; - } if (fw_tx->size % 4) { printk(KERN_ERR "starfire: bogus length %zu in \"%s\"\n", fw_tx->size, FIRMWARE_TX); diff --git a/drivers/net/ethernet/alteon/acenic.c b/drivers/net/ethernet/alteon/acenic.c index b90a26b13fdf..30a1fd3c8726 100644 --- a/drivers/net/ethernet/alteon/acenic.c +++ b/drivers/net/ethernet/alteon/acenic.c @@ -2888,11 +2888,8 @@ static int ace_load_firmware(struct net_device *dev) fw_name = "acenic/tg1.bin"; ret = request_firmware(&fw, fw_name, &ap->pdev->dev); - if (ret) { - printk(KERN_ERR "%s: Failed to load firmware \"%s\"\n", - ap->name, fw_name); + if (ret) return ret; - } fw_data = (void *)fw->data; diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index 8fc3f3c137f8..ef0132f8c989 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c @@ -3720,16 +3720,13 @@ static int bnx2_request_uncached_firmware(struct bnx2 *bp) } rc = request_firmware(&bp->mips_firmware, mips_fw_file, &bp->pdev->dev); - if (rc) { - pr_err("Can't load firmware file \"%s\"\n", mips_fw_file); + if (rc) goto out; - } rc = request_firmware(&bp->rv2p_firmware, rv2p_fw_file, &bp->pdev->dev); - if (rc) { - pr_err("Can't load firmware file \"%s\"\n", rv2p_fw_file); + if (rc) goto err_release_mips_firmware; - } + mips_fw = (const struct bnx2_mips_fw_file *) bp->mips_firmware->data; rv2p_fw = (const struct bnx2_rv2p_fw_file *) bp->rv2p_firmware->data; if (bp->mips_firmware->size < sizeof(*mips_fw) || diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 2e611dc5f162..4d57b173f699 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -13401,11 +13401,8 @@ static int bnx2x_init_firmware(struct bnx2x *bp) BNX2X_DEV_INFO("Loading %s\n", fw_file_name); rc = request_firmware(&bp->firmware, fw_file_name, &bp->pdev->dev); - if (rc) { - BNX2X_ERR("Can't load firmware file %s\n", - fw_file_name); + if (rc) goto request_firmware_exit; - } rc = bnx2x_check_firmware(bp); if (rc) { diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index ca5ac5d6f4e6..c233af71ca99 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -11348,11 +11348,8 @@ static int tg3_request_firmware(struct tg3 *tp) { const struct tg3_firmware_hdr *fw_hdr; - if (request_firmware(&tp->fw, tp->fw_needed, &tp->pdev->dev)) { - netdev_err(tp->dev, "Failed to load firmware \"%s\"\n", - tp->fw_needed); + if (request_firmware(&tp->fw, tp->fw_needed, &tp->pdev->dev)) return -ENOENT; - } fw_hdr = (struct tg3_firmware_hdr *)tp->fw->data; diff --git a/drivers/net/ethernet/brocade/bna/cna_fwimg.c b/drivers/net/ethernet/brocade/bna/cna_fwimg.c index 2e7fb97883dc..0f9ae5be8b6f 100644 --- a/drivers/net/ethernet/brocade/bna/cna_fwimg.c +++ b/drivers/net/ethernet/brocade/bna/cna_fwimg.c @@ -32,10 +32,8 @@ cna_read_firmware(struct pci_dev *pdev, u32 **bfi_image, const struct firmware *fw; u32 n; - if (request_firmware(&fw, fw_name, &pdev->dev)) { - dev_alert(&pdev->dev, "can't load firmware %s\n", fw_name); + if (request_firmware(&fw, fw_name, &pdev->dev)) goto error; - } *bfi_image = (u32 *)fw->data; *bfi_image_size = fw->size/sizeof(u32); diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c index 8f7aa53a4c4b..9dda9340950a 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c @@ -1034,12 +1034,8 @@ int t3_get_edc_fw(struct cphy *phy, int edc_idx, int size) fw_name = get_edc_fw_name(edc_idx); if (fw_name) ret = request_firmware(&fw, fw_name, &adapter->pdev->dev); - if (ret < 0) { - dev_err(&adapter->pdev->dev, - "could not upgrade firmware: unable to load %s\n", - fw_name); + if (ret) return ret; - } /* check size, take checksum in account */ if (fw->size > size + 4) { @@ -1076,11 +1072,8 @@ static int upgrade_fw(struct adapter *adap) struct device *dev = &adap->pdev->dev; ret = request_firmware(&fw, FW_FNAME, dev); - if (ret < 0) { - dev_err(dev, "could not upgrade firmware: unable to load %s\n", - FW_FNAME); + if (ret) return ret; - } ret = t3_load_fw(adap, fw->data, fw->size); release_firmware(fw); @@ -1125,11 +1118,8 @@ static int update_tpsram(struct adapter *adap) snprintf(buf, sizeof(buf), TPSRAM_NAME, rev); ret = request_firmware(&tpsram, buf, dev); - if (ret < 0) { - dev_err(dev, "could not load TP SRAM: unable to load %s\n", - buf); + if (ret) return ret; - } ret = t3_check_tpsram(adap, tpsram->data, tpsram->size); if (ret) diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c index 068789e694c9..b1ee1a329d42 100644 --- a/drivers/net/ethernet/intel/e100.c +++ b/drivers/net/ethernet/intel/e100.c @@ -1290,9 +1290,6 @@ static const struct firmware *e100_request_firmware(struct nic *nic) if (err) { if (required) { - netif_err(nic, probe, nic->netdev, - "Failed to load firmware \"%s\": %d\n", - fw_name, err); return ERR_PTR(err); } else { netif_info(nic, probe, nic->netdev, diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c index 83651ac8ddb9..9222ad96ce0f 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c @@ -596,8 +596,6 @@ static int myri10ge_load_hotplug_firmware(struct myri10ge_priv *mgp, u32 * size) unsigned i; if ((status = request_firmware(&fw, mgp->fw_name, dev)) < 0) { - dev_err(dev, "Unable to load %s firmware image via hotplug\n", - mgp->fw_name); status = -EINVAL; goto abort_with_nothing; } diff --git a/drivers/net/ethernet/smsc/smc91c92_cs.c b/drivers/net/ethernet/smsc/smc91c92_cs.c index 3449893aea8d..7e1969f0202f 100644 --- a/drivers/net/ethernet/smsc/smc91c92_cs.c +++ b/drivers/net/ethernet/smsc/smc91c92_cs.c @@ -647,10 +647,8 @@ static int osi_load_firmware(struct pcmcia_device *link) int i, err; err = request_firmware(&fw, FIRMWARE_NAME, &link->dev); - if (err) { - pr_err("Failed to load firmware \"%s\"\n", FIRMWARE_NAME); + if (err) return err; - } /* Download the Seven of Diamonds firmware */ for (i = 0; i < fw->size; i++) { diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c index 062bce9acde6..008af778a656 100644 --- a/drivers/net/ethernet/sun/cassini.c +++ b/drivers/net/ethernet/sun/cassini.c @@ -816,11 +816,8 @@ static void cas_saturn_firmware_init(struct cas *cp) return; err = request_firmware(&fw, fw_name, &cp->pdev->dev); - if (err) { - pr_err("Failed to load firmware \"%s\"\n", - fw_name); + if (err) return; - } if (fw->size < 2) { pr_err("bogus length %zu in \"%s\"\n", fw->size, fw_name); diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index 1a4729c36aa4..19d983544535 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c @@ -372,11 +372,8 @@ static unsigned char *add_mcs(unsigned char *bits, int bitrate, } err = request_firmware(&fw, fw_name[predef], &pdev->dev); platform_device_unregister(pdev); - if (err) { - printk(KERN_ERR "Failed to load firmware \"%s\"\n", - fw_name[predef]); + if (err) return NULL; - } if (fw->size != YAM_FPGA_SIZE) { printk(KERN_ERR "Bogus length %zu in firmware \"%s\"\n", fw->size, fw_name[predef]); diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index f64b25c221e8..600c1156b42d 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c @@ -396,10 +396,8 @@ static int kaweth_download_firmware(struct kaweth_device *kaweth, int ret; ret = request_firmware(&fw, fwname, &kaweth->dev->dev); - if (ret) { - dev_err(&kaweth->intf->dev, "Firmware request failed\n"); + if (ret) return ret; - } if (fw->size > KAWETH_FIRMWARE_BUF_SIZE) { dev_err(&kaweth->intf->dev, "Firmware too big: %zu\n", diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c index c9c711dcd0e6..3aa30f3d9224 100644 --- a/drivers/net/wimax/i2400m/fw.c +++ b/drivers/net/wimax/i2400m/fw.c @@ -1582,11 +1582,8 @@ int i2400m_dev_bootstrap(struct i2400m *i2400m, enum i2400m_bri flags) } d_printf(1, dev, "trying firmware %s (%d)\n", fw_name, itr); ret = request_firmware(&fw, fw_name, dev); - if (ret < 0) { - dev_err(dev, "fw %s: cannot load file: %d\n", - fw_name, ret); + if (ret) continue; - } i2400m->fw_name = fw_name; ret = i2400m_fw_bootstrap(i2400m, fw, flags); release_firmware(fw); @@ -1629,8 +1626,6 @@ void i2400m_fw_cache(struct i2400m *i2400m) kref_init(&i2400m_fw->kref); result = request_firmware(&i2400m_fw->fw, i2400m->fw_name, dev); if (result < 0) { - dev_err(dev, "firmware %s: failed to cache: %d\n", - i2400m->fw_name, result); kfree(i2400m_fw); i2400m_fw = (void *) ~0; } else diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c index dab25136214a..66b1d7421cf6 100644 --- a/drivers/net/wireless/at76c50x-usb.c +++ b/drivers/net/wireless/at76c50x-usb.c @@ -1622,13 +1622,8 @@ static struct fwentry *at76_load_firmware(struct usb_device *udev, at76_dbg(DBG_FW, "downloading firmware %s", fwe->fwname); ret = request_firmware(&fwe->fw, fwe->fwname, &udev->dev); - if (ret < 0) { - dev_err(&udev->dev, "firmware %s not found!\n", - fwe->fwname); - dev_err(&udev->dev, - "you may need to download the firmware from http://developer.berlios.de/projects/at76c503a/\n"); + if (ret) goto exit; - } at76_dbg(DBG_FW, "got it."); fwh = (struct at76_fw_header *)(fwe->fw->data); diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c index 165dd202c365..0e073ece9a52 100644 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c @@ -1158,9 +1158,6 @@ static void ath9k_hif_usb_firmware_cb(const struct firmware *fw, void *context) if (!ret) return; - dev_err(&hif_dev->udev->dev, - "ath9k_htc: Failed to get firmware %s\n", - hif_dev->fw_name); goto err_fw; } diff --git a/drivers/net/wireless/ath/carl9170/usb.c b/drivers/net/wireless/ath/carl9170/usb.c index 76842e6ca38e..e62f5c89539f 100644 --- a/drivers/net/wireless/ath/carl9170/usb.c +++ b/drivers/net/wireless/ath/carl9170/usb.c @@ -1033,7 +1033,6 @@ static void carl9170_usb_firmware_step2(const struct firmware *fw, return; } - dev_err(&ar->udev->dev, "firmware not found.\n"); carl9170_usb_firmware_failed(ar); } diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index 6a1f03c271c1..5a255fb752d9 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c @@ -3917,12 +3917,8 @@ static int reset_atmel_card(struct net_device *dev) strcpy(priv->firmware_id, "atmel_at76c502.bin"); } err = request_firmware(&fw_entry, priv->firmware_id, priv->sys_dev); - if (err != 0) { - printk(KERN_ALERT - "%s: firmware %s is missing, cannot continue.\n", - dev->name, priv->firmware_id); + if (err != 0) return err; - } } else { int fw_index = 0; int success = 0; diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index ec013fbd6a81..a0ab821d53ac 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -2253,19 +2253,8 @@ int b43_do_request_fw(struct b43_request_fw_context *ctx, } err = request_firmware(&ctx->blob, ctx->fwname, ctx->dev->dev->dev); - if (err == -ENOENT) { - snprintf(ctx->errors[ctx->req_type], - sizeof(ctx->errors[ctx->req_type]), - "Firmware file \"%s\" not found\n", - ctx->fwname); - return err; - } else if (err) { - snprintf(ctx->errors[ctx->req_type], - sizeof(ctx->errors[ctx->req_type]), - "Firmware file \"%s\" request failed (err=%d)\n", - ctx->fwname, err); + if (err) return err; - } fw_ready: if (ctx->blob->size < sizeof(struct b43_fw_header)) goto err_format; diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index afc1fb3e38df..4eac3e8f5998 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c @@ -1554,11 +1554,8 @@ static int do_request_fw(struct b43legacy_wldev *dev, } else { err = request_firmware(fw, path, dev->dev->dev); } - if (err) { - b43legacyerr(dev->wl, "Firmware file \"%s\" not found " - "or load failed.\n", path); + if (err) return err; - } if ((*fw)->size < sizeof(struct b43legacy_fw_header)) goto err_format; hdr = (struct b43legacy_fw_header *)((*fw)->data); diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c index bec2dc1ca2e4..97fb55fba63f 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c @@ -378,19 +378,13 @@ static int brcms_request_fw(struct brcms_info *wl, struct bcma_device *pdev) sprintf(fw_name, "%s-%d.fw", brcms_firmwares[i], UCODE_LOADER_API_VER); status = request_firmware(&wl->fw.fw_bin[i], fw_name, device); - if (status) { - wiphy_err(wl->wiphy, "%s: fail to load firmware %s\n", - KBUILD_MODNAME, fw_name); + if (status) return status; - } sprintf(fw_name, "%s_hdr-%d.fw", brcms_firmwares[i], UCODE_LOADER_API_VER); status = request_firmware(&wl->fw.fw_hdr[i], fw_name, device); - if (status) { - wiphy_err(wl->wiphy, "%s: fail to load firmware %s\n", - KBUILD_MODNAME, fw_name); + if (status) return status; - } wl->fw.hdr_num_entries[i] = wl->fw.fw_hdr[i]->size / (sizeof(struct firmware_hdr)); } diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 36818c7f30b9..8e9464d95870 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c @@ -8411,12 +8411,8 @@ static int ipw2100_get_firmware(struct ipw2100_priv *priv, rc = request_firmware(&fw->fw_entry, fw_name, &priv->pci_dev->dev); - if (rc < 0) { - printk(KERN_ERR DRV_NAME ": " - "%s: Firmware '%s' not available or load failed.\n", - priv->net_dev->name, fw_name); + if (rc) return rc; - } IPW_DEBUG_INFO("firmware data %p size %zd\n", fw->fw_entry->data, fw->fw_entry->size); diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c index ed0adaf1eec4..9b2e14e825df 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c @@ -3418,10 +3418,8 @@ static int ipw_get_fw(struct ipw_priv *priv, /* ask firmware_class module to get the boot firmware off disk */ rc = request_firmware(raw, name, &priv->pci_dev->dev); - if (rc < 0) { - IPW_ERROR("%s request_firmware failed: Reason %d\n", name, rc); + if (rc) return rc; - } if ((*raw)->size < sizeof(*fw)) { IPW_ERROR("%s is too small (%zd)\n", name, (*raw)->size); diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c index af1b3e6839fa..86bcfe14014f 100644 --- a/drivers/net/wireless/iwlegacy/3945-mac.c +++ b/drivers/net/wireless/iwlegacy/3945-mac.c @@ -1861,7 +1861,6 @@ il3945_read_ucode(struct il_priv *il) sprintf(buf, "%s%u%s", name_pre, idx, ".ucode"); ret = request_firmware(&ucode_raw, buf, &il->pci_dev->dev); if (ret < 0) { - IL_ERR("%s firmware file req failed: %d\n", buf, ret); if (ret == -ENOENT) continue; else diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c index 463cadfbfccb..62a1cffe8c00 100644 --- a/drivers/net/wireless/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/iwlwifi/iwl-drv.c @@ -1201,13 +1201,8 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) if (!pieces) return; - if (!ucode_raw) { - if (drv->fw_index <= api_ok) - IWL_ERR(drv, - "request for firmware file '%s' failed.\n", - drv->firmware_name); + if (!ucode_raw) goto try_again; - } IWL_DEBUG_INFO(drv, "Loaded firmware file '%s' (%zd bytes).\n", drv->firmware_name, ucode_raw->size); diff --git a/drivers/net/wireless/libertas_tf/if_usb.c b/drivers/net/wireless/libertas_tf/if_usb.c index 799a2efe5793..02b103a44fcf 100644 --- a/drivers/net/wireless/libertas_tf/if_usb.c +++ b/drivers/net/wireless/libertas_tf/if_usb.c @@ -824,8 +824,6 @@ static int if_usb_prog_firmware(struct if_usb_card *cardp) kernel_param_lock(THIS_MODULE); ret = request_firmware(&cardp->fw, lbtf_fw_name, &cardp->udev->dev); if (ret < 0) { - pr_err("request_firmware() failed with %#x\n", ret); - pr_err("firmware %s not found\n", lbtf_fw_name); kernel_param_unlock(THIS_MODULE); goto done; } diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c index 969ca1e1f3e9..2e41a1a76c8e 100644 --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c @@ -508,11 +508,8 @@ static void mwifiex_fw_dpc(const struct firmware *firmware, void *context) bool init_failed = false; struct wireless_dev *wdev; - if (!firmware) { - mwifiex_dbg(adapter, ERROR, - "Failed to get firmware %s\n", adapter->fw_name); + if (!firmware) goto err_dnld_fw; - } memset(&fw, 0, sizeof(struct mwifiex_fw_image)); adapter->firmware = firmware; diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index 30e3aaae32e2..3ad46e08a57a 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c @@ -5712,16 +5712,12 @@ static int mwl8k_firmware_load_success(struct mwl8k_priv *priv); static void mwl8k_fw_state_machine(const struct firmware *fw, void *context) { struct mwl8k_priv *priv = context; - struct mwl8k_device_info *di = priv->device_info; int rc; switch (priv->fw_state) { case FW_STATE_INIT: - if (!fw) { - printk(KERN_ERR "%s: Error requesting helper fw %s\n", - pci_name(priv->pdev), di->helper_image); + if (!fw) goto fail; - } priv->fw_helper = fw; rc = mwl8k_request_fw(priv, priv->fw_pref, &priv->fw_ucode, true); @@ -5756,11 +5752,8 @@ static void mwl8k_fw_state_machine(const struct firmware *fw, void *context) break; case FW_STATE_LOADING_ALT: - if (!fw) { - printk(KERN_ERR "%s: Error requesting alt fw %s\n", - pci_name(priv->pdev), di->helper_image); + if (!fw) goto fail; - } priv->fw_ucode = fw; rc = mwl8k_firmware_load_success(priv); if (rc) @@ -5798,10 +5791,8 @@ retry: /* Ask userland hotplug daemon for the device firmware */ rc = mwl8k_request_firmware(priv, fw_image, nowait); - if (rc) { - wiphy_err(hw->wiphy, "Firmware files not found\n"); + if (rc) return rc; - } if (nowait) return rc; diff --git a/drivers/net/wireless/orinoco/fw.c b/drivers/net/wireless/orinoco/fw.c index 400a35217644..2559f7f1252c 100644 --- a/drivers/net/wireless/orinoco/fw.c +++ b/drivers/net/wireless/orinoco/fw.c @@ -132,7 +132,6 @@ orinoco_dl_firmware(struct orinoco_private *priv, err = request_firmware(&fw_entry, firmware, priv->dev); if (err) { - dev_err(dev, "Cannot find firmware %s\n", firmware); err = -ENOENT; goto free; } @@ -292,10 +291,8 @@ symbol_dl_firmware(struct orinoco_private *priv, const struct firmware *fw_entry; if (!orinoco_cached_fw_get(priv, true)) { - if (request_firmware(&fw_entry, fw->pri_fw, priv->dev) != 0) { - dev_err(dev, "Cannot find firmware: %s\n", fw->pri_fw); + if (request_firmware(&fw_entry, fw->pri_fw, priv->dev) != 0) return -ENOENT; - } } else fw_entry = orinoco_cached_fw_get(priv, true); @@ -311,10 +308,8 @@ symbol_dl_firmware(struct orinoco_private *priv, } if (!orinoco_cached_fw_get(priv, false)) { - if (request_firmware(&fw_entry, fw->sta_fw, priv->dev) != 0) { - dev_err(dev, "Cannot find firmware: %s\n", fw->sta_fw); + if (request_firmware(&fw_entry, fw->sta_fw, priv->dev) != 0) return -ENOENT; - } } else fw_entry = orinoco_cached_fw_get(priv, false); diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c index f2cd513d54b2..7a398d87ca2b 100644 --- a/drivers/net/wireless/orinoco/orinoco_usb.c +++ b/drivers/net/wireless/orinoco/orinoco_usb.c @@ -1669,7 +1669,6 @@ static int ezusb_probe(struct usb_interface *interface, if (ezusb_firmware_download(upriv, &firmware) < 0) goto error; } else { - err("No firmware to download"); goto error; } diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c index 27a49068d32d..a12c388e3723 100644 --- a/drivers/net/wireless/p54/p54pci.c +++ b/drivers/net/wireless/p54/p54pci.c @@ -499,7 +499,6 @@ static void p54p_firmware_step2(const struct firmware *fw, int err; if (!fw) { - dev_err(&pdev->dev, "Cannot find firmware (isl3886pci)\n"); err = -ENOENT; goto out; } diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c index 7ab2f43ab425..d2700334ccf7 100644 --- a/drivers/net/wireless/p54/p54spi.c +++ b/drivers/net/wireless/p54/p54spi.c @@ -170,10 +170,8 @@ static int p54spi_request_firmware(struct ieee80211_hw *dev) /* FIXME: should driver use it's own struct device? */ ret = request_firmware(&priv->firmware, "3826.arm", &priv->spi->dev); - if (ret < 0) { - dev_err(&priv->spi->dev, "request_firmware() failed: %d", ret); + if (ret) return ret; - } ret = p54_parse_firmware(dev, priv->firmware); if (ret) { diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c index 043bd1c23c19..e44f623394f8 100644 --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c @@ -929,7 +929,6 @@ static void p54u_load_firmware_cb(const struct firmware *firmware, err = p54u_start_ops(priv); } else { err = -ENOENT; - dev_err(&udev->dev, "Firmware not found.\n"); } if (err) { diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c index 931cf440ff18..1a3f2b45d82b 100644 --- a/drivers/net/wireless/prism54/islpci_dev.c +++ b/drivers/net/wireless/prism54/islpci_dev.c @@ -92,12 +92,9 @@ isl_upload_firmware(islpci_private *priv) const u32 *fw_ptr; rc = request_firmware(&fw_entry, priv->firmware, PRISM_FW_PDEV); - if (rc) { - printk(KERN_ERR - "%s: request_firmware() failed for '%s'\n", - "prism54", priv->firmware); + if (rc) return rc; - } + /* prepare the Direct Memory Base register */ reg = ISL38XX_DEV_FIRMWARE_ADDRES; diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c index c925a4dff599..6ccdb7e61518 100644 --- a/drivers/net/wireless/realtek/rtlwifi/core.c +++ b/drivers/net/wireless/realtek/rtlwifi/core.c @@ -115,7 +115,6 @@ static void rtl_fw_do_work(const struct firmware *firmware, void *context, if (!err) goto found_alt; } - pr_err("Firmware %s not available\n", rtlpriv->cfg->fw_name); rtlpriv->max_fw_size = 0; return; } diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c index 31baca41ac2f..ad7d12ca387b 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c @@ -94,7 +94,6 @@ static void rtl92se_fw_cb(const struct firmware *firmware, void *context) "Firmware callback routine entered!\n"); complete(&rtlpriv->firmware_loading_complete); if (!firmware) { - pr_err("Firmware %s not available\n", rtlpriv->cfg->fw_name); rtlpriv->max_fw_size = 0; return; } diff --git a/drivers/net/wireless/rt2x00/rt2x00firmware.c b/drivers/net/wireless/rt2x00/rt2x00firmware.c index 5813300f68a2..ecebea6f5387 100644 --- a/drivers/net/wireless/rt2x00/rt2x00firmware.c +++ b/drivers/net/wireless/rt2x00/rt2x00firmware.c @@ -49,10 +49,8 @@ static int rt2x00lib_request_firmware(struct rt2x00_dev *rt2x00dev) rt2x00_info(rt2x00dev, "Loading firmware file '%s'\n", fw_name); retval = request_firmware(&fw, fw_name, device); - if (retval) { - rt2x00_err(rt2x00dev, "Failed to request Firmware\n"); + if (retval) return retval; - } if (!fw || !fw->size || !fw->data) { rt2x00_err(rt2x00dev, "Failed to read Firmware\n"); diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c index cd4777954f87..eef8c9a3820e 100644 --- a/drivers/net/wireless/ti/wl1251/main.c +++ b/drivers/net/wireless/ti/wl1251/main.c @@ -71,10 +71,8 @@ static int wl1251_fetch_firmware(struct wl1251 *wl) ret = request_firmware(&fw, WL1251_FW_NAME, dev); - if (ret < 0) { - wl1251_error("could not get firmware: %d", ret); + if (ret) return ret; - } if (fw->size % 4) { wl1251_error("firmware size is not multiple of 32 bits: %zu", @@ -110,10 +108,8 @@ static int wl1251_fetch_nvs(struct wl1251 *wl) ret = request_firmware(&fw, WL1251_NVS_NAME, dev); - if (ret < 0) { - wl1251_error("could not get nvs file: %d", ret); + if (ret) return ret; - } if (fw->size % 4) { wl1251_error("nvs size is not multiple of 32 bits: %zu", diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index ec7f6af3fab2..e33b5bfb543e 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -762,10 +762,8 @@ static int wl12xx_fetch_firmware(struct wl1271 *wl, bool plt) ret = request_firmware(&fw, fw_name, wl->dev); - if (ret < 0) { - wl1271_error("could not get firmware %s: %d", fw_name, ret); + if (ret) return ret; - } if (fw->size % 4) { wl1271_error("firmware size is not multiple of 32 bits: %zu", diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c index 6f5c793a7855..d543ac3b9d59 100644 --- a/drivers/net/wireless/zd1201.c +++ b/drivers/net/wireless/zd1201.c @@ -65,8 +65,6 @@ static int zd1201_fw_upload(struct usb_device *dev, int apfw) err = request_firmware(&fw_entry, fwfile, &dev->dev); if (err) { - dev_err(&dev->dev, "Failed to load %s firmware file!\n", fwfile); - dev_err(&dev->dev, "Make sure the hotplug firmware loader is installed.\n"); dev_err(&dev->dev, "Goto http://linux-lc100020.sourceforge.net for more info.\n"); return err; } diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c index a912dc051111..2eea48b467cb 100644 --- a/drivers/net/wireless/zd1211rw/zd_usb.c +++ b/drivers/net/wireless/zd1211rw/zd_usb.c @@ -120,16 +120,9 @@ static void int_urb_complete(struct urb *urb); static int request_fw_file( const struct firmware **fw, const char *name, struct device *device) { - int r; - dev_dbg_f(device, "fw name %s\n", name); - r = request_firmware(fw, name, device); - if (r) - dev_err(device, - "Could not load firmware file %s. Error number %d\n", - name, r); - return r; + return request_firmware(fw, name, device); } static inline u16 get_bcdDevice(const struct usb_device *udev) diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index febbd83e2ecd..e26fb7159c27 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c @@ -4107,8 +4107,6 @@ static int AscInitAsc1000Driver(ASC_DVC_VAR *asc_dvc) err = request_firmware(&fw, fwname, asc_dvc->drv_ptr->dev); if (err) { - printk(KERN_ERR "Failed to load image \"%s\" err %d\n", - fwname, err); asc_dvc->err_code |= ASC_IERR_MCODE_CHKSUM; return err; } @@ -4473,8 +4471,6 @@ static int AdvInitAsc3550Driver(ADV_DVC_VAR *asc_dvc) err = request_firmware(&fw, fwname, asc_dvc->drv_ptr->dev); if (err) { - printk(KERN_ERR "Failed to load image \"%s\" err %d\n", - fwname, err); asc_dvc->err_code = ASC_IERR_MCODE_CHKSUM; return err; } @@ -4973,8 +4969,6 @@ static int AdvInitAsc38C0800Driver(ADV_DVC_VAR *asc_dvc) err = request_firmware(&fw, fwname, asc_dvc->drv_ptr->dev); if (err) { - printk(KERN_ERR "Failed to load image \"%s\" err %d\n", - fwname, err); asc_dvc->err_code = ASC_IERR_MCODE_CHKSUM; return err; } @@ -5461,8 +5455,6 @@ static int AdvInitAsc38C1600Driver(ADV_DVC_VAR *asc_dvc) err = request_firmware(&fw, fwname, asc_dvc->drv_ptr->dev); if (err) { - printk(KERN_ERR "Failed to load image \"%s\" err %d\n", - fwname, err); asc_dvc->err_code = ASC_IERR_MCODE_CHKSUM; return err; } diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c index 662b2321d1b0..19c1559e3c80 100644 --- a/drivers/scsi/aic94xx/aic94xx_init.c +++ b/drivers/scsi/aic94xx/aic94xx_init.c @@ -384,8 +384,6 @@ static ssize_t asd_store_update_bios(struct device *dev, filename_ptr, &asd_ha->pcidev->dev); if (err) { - asd_printk("Failed to load bios image file %s, error %d\n", - filename_ptr, err); err = FAIL_OPEN_BIOS_FILE; goto out1; } diff --git a/drivers/scsi/aic94xx/aic94xx_seq.c b/drivers/scsi/aic94xx/aic94xx_seq.c index 5fdca93892ad..19d1cfdca6b5 100644 --- a/drivers/scsi/aic94xx/aic94xx_seq.c +++ b/drivers/scsi/aic94xx/aic94xx_seq.c @@ -1317,11 +1317,8 @@ int asd_init_seqs(struct asd_ha_struct *asd_ha) err = asd_request_firmware(asd_ha); - if (err) { - asd_printk("Failed to load sequencer firmware file %s, error %d\n", - SAS_RAZOR_SEQUENCER_FW_FILE, err); + if (err) return err; - } err = asd_seq_download_seqs(asd_ha); if (err) { diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c index cc3b9d3d6d40..873ee38e948f 100644 --- a/drivers/scsi/bfa/bfad.c +++ b/drivers/scsi/bfa/bfad.c @@ -1762,7 +1762,6 @@ bfad_read_firmware(struct pci_dev *pdev, u32 **bfi_image, const struct firmware *fw; if (request_firmware(&fw, fw_name, &pdev->dev)) { - printk(KERN_ALERT "Can't locate firmware %s\n", fw_name); *bfi_image = NULL; goto out; } diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 536cd5a80422..0c50ef097b00 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c @@ -4011,10 +4011,8 @@ static ssize_t ipr_store_update_fw(struct device *dev, len = snprintf(fname, 99, "%s", buf); fname[len-1] = '\0'; - if (request_firmware(&fw_entry, fname, &ioa_cfg->pdev->dev)) { - dev_err(&ioa_cfg->pdev->dev, "Firmware file %s not found\n", fname); + if (request_firmware(&fw_entry, fname, &ioa_cfg->pdev->dev)) return -EIO; - } image_hdr = (struct ipr_ucode_image_header *)fw_entry->data; diff --git a/drivers/scsi/pm8001/pm8001_ctl.c b/drivers/scsi/pm8001/pm8001_ctl.c index be8269c8d127..d7770a607326 100644 --- a/drivers/scsi/pm8001/pm8001_ctl.c +++ b/drivers/scsi/pm8001/pm8001_ctl.c @@ -685,10 +685,6 @@ static ssize_t pm8001_store_update_fw(struct device *cdev, pm8001_ha->dev); if (ret) { - PM8001_FAIL_DBG(pm8001_ha, - pm8001_printk( - "Failed to load firmware image file %s, error %d\n", - filename_ptr, ret)); pm8001_ha->fw_status = FAIL_OPEN_BIOS_FILE; goto out; } diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c index 5d0ec42a9317..e891bf638d9d 100644 --- a/drivers/scsi/qla1280.c +++ b/drivers/scsi/qla1280.c @@ -1552,8 +1552,6 @@ qla1280_request_firmware(struct scsi_qla_host *ha) err = request_firmware(&fw, fwname, &ha->pdev->dev); if (err) { - printk(KERN_ERR "Failed to load image \"%s\" err %d\n", - fwname, err); fw = ERR_PTR(err); goto unlock; } diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index e197c6f39de2..9869d64083e9 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -5520,8 +5520,6 @@ qla2x00_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr) /* Load firmware blob. */ blob = qla2x00_request_firmware(vha); if (!blob) { - ql_log(ql_log_info, vha, 0x0083, - "Firmware image unavailable.\n"); ql_log(ql_log_info, vha, 0x0084, "Firmware images can be retrieved from: "QLA_FW_URL ".\n"); return QLA_FUNCTION_FAILED; @@ -5623,8 +5621,6 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr) /* Load firmware blob. */ blob = qla2x00_request_firmware(vha); if (!blob) { - ql_log(ql_log_warn, vha, 0x0090, - "Firmware image unavailable.\n"); ql_log(ql_log_warn, vha, 0x0091, "Firmware images can be retrieved from: " QLA_FW_URL ".\n"); diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c index b6b4cfdd7620..ff73901c0603 100644 --- a/drivers/scsi/qla2xxx/qla_nx.c +++ b/drivers/scsi/qla2xxx/qla_nx.c @@ -2460,11 +2460,8 @@ try_blob_fw: /* Load firmware blob. */ blob = ha->hablob = qla2x00_request_firmware(vha); - if (!blob) { - ql_log(ql_log_fatal, vha, 0x00a3, - "Firmware image not present.\n"); + if (!blob) goto fw_load_failed; - } /* Validating firmware blob */ if (qla82xx_validate_firmware_blob(vha, diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index fc6674db4f2d..09efa71dda0b 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -5370,8 +5370,6 @@ qla2x00_request_firmware(scsi_qla_host_t *vha) goto out; if (request_firmware(&blob->fw, blob->name, &ha->pdev->dev)) { - ql_log(ql_log_warn, vha, 0x0063, - "Failed to load firmware image (%s).\n", blob->name); blob->fw = NULL; blob = NULL; goto out; diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c index 676385ff28ef..7e3df56b1e86 100644 --- a/drivers/scsi/qlogicpti.c +++ b/drivers/scsi/qlogicpti.c @@ -475,11 +475,8 @@ static int qlogicpti_load_firmware(struct qlogicpti *qpti) int i, timeout; err = request_firmware(&fw, fwname, &qpti->op->dev); - if (err) { - printk(KERN_ERR "Failed to load image \"%s\" err %d\n", - fwname, err); + if (err) return err; - } if (fw->size % 2) { printk(KERN_ERR "Bogus length %zu in image \"%s\"\n", fw->size, fwname); diff --git a/drivers/staging/media/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c index ce3b5f230e2e..9b7bd7f1dd46 100644 --- a/drivers/staging/media/lirc/lirc_zilog.c +++ b/drivers/staging/media/lirc/lirc_zilog.c @@ -762,9 +762,6 @@ static int fw_load(struct IR_tx *tx) /* Request codeset data file */ ret = request_firmware(&fw_entry, "haup-ir-blaster.bin", tx->ir->l.dev); if (ret != 0) { - dev_err(tx->ir->l.dev, - "firmware haup-ir-blaster.bin not available (%d)\n", - ret); ret = ret < 0 ? ret : -EFAULT; goto out; } diff --git a/drivers/staging/rtl8192u/r819xU_firmware.c b/drivers/staging/rtl8192u/r819xU_firmware.c index 08302dfb0d90..c2413c8fbca4 100644 --- a/drivers/staging/rtl8192u/r819xU_firmware.c +++ b/drivers/staging/rtl8192u/r819xU_firmware.c @@ -244,10 +244,8 @@ bool init_firmware(struct net_device *dev) */ if (rst_opt == OPT_SYSTEM_RESET) { rc = request_firmware(&fw_entry, fw_name[init_step], &priv->udev->dev); - if (rc < 0) { - RT_TRACE(COMP_ERR, "request firmware fail!\n"); + if (rc) goto download_firmware_fail; - } if (fw_entry->size > sizeof(pfirmware->firmware_buf)) { RT_TRACE(COMP_ERR, "img file size exceed the container buffer fail!\n"); diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c index 8008efe5686d..915f4d796692 100644 --- a/drivers/staging/rtl8712/hal_init.c +++ b/drivers/staging/rtl8712/hal_init.c @@ -71,8 +71,6 @@ int rtl871x_load_fw(struct _adapter *padapter) dev_info(dev, "r8712u: Loading firmware from \"%s\"\n", firmware_file); rc = request_firmware_nowait(THIS_MODULE, 1, firmware_file, dev, GFP_KERNEL, padapter, rtl871x_load_fw_cb); - if (rc) - dev_err(dev, "r8712u: Firmware request error %d\n", rc); return rc; } MODULE_FIRMWARE("rtlwifi/rtl8712u.bin"); diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c index b23a2d1f61a2..242d83306ebf 100644 --- a/drivers/staging/slicoss/slicoss.c +++ b/drivers/staging/slicoss/slicoss.c @@ -408,11 +408,8 @@ static int slic_card_download_gbrcv(struct adapter *adapter) } ret = request_firmware(&fw, file, &adapter->pcidev->dev); - if (ret) { - dev_err(&adapter->pcidev->dev, - "Failed to load firmware %s\n", file); + if (ret) return ret; - } rcvucodelen = *(u32 *)(fw->data + index); index += 4; @@ -486,11 +483,8 @@ static int slic_card_download(struct adapter *adapter) return -ENOENT; } ret = request_firmware(&fw, file, &adapter->pcidev->dev); - if (ret) { - dev_err(&adapter->pcidev->dev, - "Failed to load firmware %s\n", file); + if (ret) return ret; - } numsects = *(u32 *)(fw->data + index); index += 4; for (i = 0; i < numsects; i++) { diff --git a/drivers/staging/vt6656/firmware.c b/drivers/staging/vt6656/firmware.c index d440f284bf18..5a2c4ed2bf61 100644 --- a/drivers/staging/vt6656/firmware.c +++ b/drivers/staging/vt6656/firmware.c @@ -53,11 +53,8 @@ int vnt_download_firmware(struct vnt_private *priv) dev_dbg(dev, "---->Download firmware\n"); rc = request_firmware(&fw, FIRMWARE_NAME, dev); - if (rc) { - dev_err(dev, "firmware file %s request failed (%d)\n", - FIRMWARE_NAME, rc); - goto out; - } + if (rc) + goto out; buffer = kmalloc(FIRMWARE_CHUNK_SIZE, GFP_KERNEL); if (!buffer) diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c index d4a1331675ed..ba3cc28cc11b 100644 --- a/drivers/tty/cyclades.c +++ b/drivers/tty/cyclades.c @@ -3509,10 +3509,8 @@ static int cyz_load_fw(struct pci_dev *pdev, void __iomem *base_addr, int retval; retval = request_firmware(&fw, "cyzfirm.bin", &pdev->dev); - if (retval) { - dev_err(&pdev->dev, "can't get firmware\n"); + if (retval) goto err; - } /* Check whether the firmware is already loaded and running. If positive, skip this board */ diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c index 14c54e041065..6a912463adb2 100644 --- a/drivers/tty/moxa.c +++ b/drivers/tty/moxa.c @@ -867,13 +867,8 @@ static int moxa_init_board(struct moxa_board_conf *brd, struct device *dev) } ret = request_firmware(&fw, file, dev); - if (ret) { - printk(KERN_ERR "MOXA: request_firmware failed. Make sure " - "you've placed '%s' file into your firmware " - "loader directory (e.g. /lib/firmware)\n", - file); + if (ret) goto err_free; - } ret = moxa_load_fw(brd, fw); diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c index ffc7cb2585a6..aad2f15ec693 100644 --- a/drivers/tty/serial/icom.c +++ b/drivers/tty/serial/icom.c @@ -375,7 +375,6 @@ static void load_code(struct icom_port *icom_port) /* Load Call Setup into Adapter */ if (request_firmware(&fw, "icom_call_setup.bin", &dev->dev) < 0) { - dev_err(&dev->dev,"Unable to load icom_call_setup.bin firmware image\n"); status = -1; goto load_code_exit; } @@ -395,7 +394,6 @@ static void load_code(struct icom_port *icom_port) /* Load Resident DCE portion of Adapter */ if (request_firmware(&fw, "icom_res_dce.bin", &dev->dev) < 0) { - dev_err(&dev->dev,"Unable to load icom_res_dce.bin firmware image\n"); status = -1; goto load_code_exit; } @@ -440,7 +438,6 @@ static void load_code(struct icom_port *icom_port) } if (request_firmware(&fw, "icom_asc.bin", &dev->dev) < 0) { - dev_err(&dev->dev,"Unable to load icom_asc.bin firmware image\n"); status = -1; goto load_code_exit; } diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c index 73190f5d2832..31fd579e3225 100644 --- a/drivers/tty/serial/ucc_uart.c +++ b/drivers/tty/serial/ucc_uart.c @@ -1167,10 +1167,8 @@ static void uart_firmware_cont(const struct firmware *fw, void *context) struct device *dev = context; int ret; - if (!fw) { - dev_err(dev, "firmware not found\n"); + if (!fw) return; - } firmware = (struct qe_firmware *) fw->data; diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c index 1173f9cbc137..04aa3b468311 100644 --- a/drivers/usb/atm/cxacru.c +++ b/drivers/usb/atm/cxacru.c @@ -1086,8 +1086,6 @@ static int cxacru_find_firmware(struct cxacru_data *instance, return -ENOENT; } - usb_info(usbatm, "found firmware %s\n", buf); - return 0; } diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c index a2ae88dbda78..0370d6772849 100644 --- a/drivers/usb/atm/ueagle-atm.c +++ b/drivers/usb/atm/ueagle-atm.c @@ -649,10 +649,8 @@ static void uea_upload_pre_firmware(const struct firmware *fw_entry, int ret, size; uea_enters(usb); - if (!fw_entry) { - uea_err(usb, "firmware is not available\n"); + if (!fw_entry) goto err; - } pfw = fw_entry->data; size = fw_entry->size; @@ -747,10 +745,6 @@ static int uea_load_firmware(struct usb_device *usb, unsigned int ver) ret = request_firmware_nowait(THIS_MODULE, 1, fw_name, &usb->dev, GFP_KERNEL, usb, uea_upload_pre_firmware); - if (ret) - uea_err(usb, "firmware %s is not available\n", fw_name); - else - uea_info(usb, "loading firmware %s\n", fw_name); uea_leaves(usb); return ret; @@ -912,12 +906,8 @@ static int request_dsp(struct uea_softc *sc) } ret = request_firmware(&sc->dsp_firm, dsp_name, &sc->usb_dev->dev); - if (ret < 0) { - uea_err(INS_TO_USBDEV(sc), - "requesting firmware %s failed with error %d\n", - dsp_name, ret); + if (ret) return ret; - } if (UEA_CHIP_VERSION(sc) == EAGLE_IV) ret = check_dsp_e4(sc->dsp_firm->data, sc->dsp_firm->size); @@ -1630,12 +1620,8 @@ static int request_cmvs_old(struct uea_softc *sc, cmvs_file_name(sc, cmv_name, 1); ret = request_firmware(fw, cmv_name, &sc->usb_dev->dev); - if (ret < 0) { - uea_err(INS_TO_USBDEV(sc), - "requesting firmware %s failed with error %d\n", - cmv_name, ret); + if (ret) return ret; - } data = (u8 *) (*fw)->data; size = (*fw)->size; @@ -1672,9 +1658,6 @@ static int request_cmvs(struct uea_softc *sc, "try to get older cmvs\n", cmv_name); return request_cmvs_old(sc, cmvs, fw); } - uea_err(INS_TO_USBDEV(sc), - "requesting firmware %s failed with error %d\n", - cmv_name, ret); return ret; } @@ -1957,11 +1940,8 @@ static int load_XILINX_firmware(struct uea_softc *sc) uea_enters(INS_TO_USBDEV(sc)); ret = request_firmware(&fw_entry, fw_name, &sc->usb_dev->dev); - if (ret) { - uea_err(INS_TO_USBDEV(sc), "firmware %s is not available\n", - fw_name); + if (ret) goto err0; - } pfw = fw_entry->data; size = fw_entry->size; diff --git a/drivers/usb/misc/emi26.c b/drivers/usb/misc/emi26.c index 8950fa5e973d..8dd7dbfb4029 100644 --- a/drivers/usb/misc/emi26.c +++ b/drivers/usb/misc/emi26.c @@ -88,21 +88,17 @@ static int emi26_load_firmware (struct usb_device *dev) err = request_ihex_firmware(&loader_fw, "emi26/loader.fw", &dev->dev); if (err) - goto nofw; + goto wraperr; err = request_ihex_firmware(&bitstream_fw, "emi26/bitstream.fw", &dev->dev); if (err) - goto nofw; + goto wraperr; err = request_ihex_firmware(&firmware_fw, "emi26/firmware.fw", &dev->dev); - if (err) { - nofw: - dev_err(&dev->dev, "%s - request_firmware() failed\n", - __func__); + if (err) goto wraperr; - } /* Assert reset (stop the CPU in the EMI) */ err = emi26_set_reset(dev,1); diff --git a/drivers/usb/misc/ezusb.c b/drivers/usb/misc/ezusb.c index 947811bc8126..f6a6091f343d 100644 --- a/drivers/usb/misc/ezusb.c +++ b/drivers/usb/misc/ezusb.c @@ -79,12 +79,8 @@ static int ezusb_ihex_firmware_download(struct usb_device *dev, const struct ihex_binrec *record; if (request_ihex_firmware(&firmware, firmware_path, - &dev->dev)) { - dev_err(&dev->dev, - "%s - request \"%s\" failed\n", - __func__, firmware_path); + &dev->dev)) goto out; - } ret = ezusb_set_reset(dev, fx.cpucs_reg, 0); if (ret < 0) diff --git a/drivers/usb/misc/isight_firmware.c b/drivers/usb/misc/isight_firmware.c index 1c61830e96f9..9d59718528c6 100644 --- a/drivers/usb/misc/isight_firmware.c +++ b/drivers/usb/misc/isight_firmware.c @@ -48,7 +48,6 @@ static int isight_firmware_load(struct usb_interface *intf, return -ENOMEM; if (request_firmware(&firmware, "isight.fw", &dev->dev) != 0) { - printk(KERN_ERR "Unable to load isight firmware\n"); ret = -ENODEV; goto out; } diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c index c0866971db2b..5777af569958 100644 --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c @@ -299,11 +299,8 @@ static void update_edgeport_E2PROM(struct edgeport_serial *edge_serial) response = request_ihex_firmware(&fw, fw_name, &edge_serial->serial->dev->dev); - if (response) { - dev_err(dev, "Failed to load image \"%s\" err %d\n", - fw_name, response); + if (response) return; - } rec = (const struct ihex_binrec *)fw->data; BootMajorVersion = rec->data[0]; diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index fce82fd79f77..9b1906fd5e84 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c @@ -1014,8 +1014,6 @@ static int download_fw(struct edgeport_serial *serial) status = request_firmware(&fw, fw_name, dev); if (status) { - dev_err(dev, "Failed to load image \"%s\" err %d\n", - fw_name, status); return status; } diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c index 2694df2f4559..77e7063e6732 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c @@ -1487,10 +1487,8 @@ static int ti_download_firmware(struct ti_device *tdev) } status = request_firmware(&fw_p, buf, &dev->dev); } - if (status) { - dev_err(&dev->dev, "%s - firmware not found\n", __func__); + if (status) return -ENOENT; - } if (fw_p->size > TI_FIRMWARE_BUF_SIZE) { dev_err(&dev->dev, "%s - firmware too large %zu\n", __func__, fw_p->size); release_firmware(fw_p); diff --git a/drivers/video/fbdev/broadsheetfb.c b/drivers/video/fbdev/broadsheetfb.c index 9f9a7bef1ff6..4b67783b3a56 100644 --- a/drivers/video/fbdev/broadsheetfb.c +++ b/drivers/video/fbdev/broadsheetfb.c @@ -743,10 +743,8 @@ static ssize_t broadsheet_loadstore_waveform(struct device *dev, return -EINVAL; err = request_firmware(&fw_entry, "broadsheet.wbf", dev); - if (err < 0) { - dev_err(dev, "Failed to get broadsheet waveform\n"); + if (err) goto err_failed; - } /* try to enforce reasonable min max on waveform */ if ((fw_entry->size < 8*1024) || (fw_entry->size > 64*1024)) { diff --git a/drivers/video/fbdev/metronomefb.c b/drivers/video/fbdev/metronomefb.c index ad04a01e2761..23ed9f15ecae 100644 --- a/drivers/video/fbdev/metronomefb.c +++ b/drivers/video/fbdev/metronomefb.c @@ -677,10 +677,8 @@ static int metronomefb_probe(struct platform_device *dev) a) request the waveform file from userspace b) process waveform and decode into metromem */ retval = request_firmware(&fw_entry, "metronome.wbf", &dev->dev); - if (retval < 0) { - dev_err(&dev->dev, "Failed to get waveform\n"); + if (retval) goto err_csum_table; - } retval = load_waveform((u8 *) fw_entry->data, fw_entry->size, 3, 31, par); diff --git a/sound/drivers/vx/vx_hwdep.c b/sound/drivers/vx/vx_hwdep.c index 3014b86362bd..671cdfa7f310 100644 --- a/sound/drivers/vx/vx_hwdep.c +++ b/sound/drivers/vx/vx_hwdep.c @@ -71,10 +71,8 @@ int snd_vx_setup_firmware(struct vx_core *chip) if (! fw_files[chip->type][i]) continue; sprintf(path, "vx/%s", fw_files[chip->type][i]); - if (request_firmware(&fw, path, chip->dev)) { - snd_printk(KERN_ERR "vx: can't load firmware %s\n", path); + if (request_firmware(&fw, path, chip->dev)) return -ENOENT; - } err = chip->ops->load_dsp(chip, i, fw); if (err < 0) { release_firmware(fw); diff --git a/sound/isa/msnd/msnd_pinnacle.c b/sound/isa/msnd/msnd_pinnacle.c index 4c072666115d..9eaed8c99934 100644 --- a/sound/isa/msnd/msnd_pinnacle.c +++ b/sound/isa/msnd/msnd_pinnacle.c @@ -389,15 +389,11 @@ static int upload_dsp_code(struct snd_card *card) outb(HPBLKSEL_0, chip->io + HP_BLKS); err = request_firmware(&init_fw, INITCODEFILE, card->dev); - if (err < 0) { - printk(KERN_ERR LOGNAME ": Error loading " INITCODEFILE); + if (err) goto cleanup1; - } err = request_firmware(&perm_fw, PERMCODEFILE, card->dev); - if (err < 0) { - printk(KERN_ERR LOGNAME ": Error loading " PERMCODEFILE); + if (err) goto cleanup; - } memcpy_toio(chip->mappedbase, perm_fw->data, perm_fw->size); if (snd_msnd_upload_host(chip, init_fw->data, init_fw->size) < 0) { diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c index 7b248cdf06e2..2cb1766b145a 100644 --- a/sound/isa/sscape.c +++ b/sound/isa/sscape.c @@ -544,10 +544,8 @@ static int sscape_upload_bootblock(struct snd_card *card) int ret; ret = request_firmware(&init_fw, "scope.cod", card->dev); - if (ret < 0) { - snd_printk(KERN_ERR "sscape: Error loading scope.cod"); + if (ret) return ret; - } ret = upload_dma_data(sscape, init_fw->data, init_fw->size); release_firmware(init_fw); @@ -584,11 +582,8 @@ static int sscape_upload_microcode(struct snd_card *card, int version) snprintf(name, sizeof(name), "sndscape.co%d", version); err = request_firmware(&init_fw, name, card->dev); - if (err < 0) { - snd_printk(KERN_ERR "sscape: Error loading sndscape.co%d", - version); + if (err) return err; - } err = upload_dma_data(sscape, init_fw->data, init_fw->size); if (err == 0) snd_printk(KERN_INFO "sscape: MIDI firmware loaded %d KBs\n", diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c index 69f76ff5693d..4901196c95cc 100644 --- a/sound/isa/wavefront/wavefront_synth.c +++ b/sound/isa/wavefront/wavefront_synth.c @@ -1947,10 +1947,8 @@ wavefront_download_firmware (snd_wavefront_t *dev, char *path) const struct firmware *firmware; err = request_firmware(&firmware, path, dev->card->dev); - if (err < 0) { - snd_printk(KERN_ERR "firmware (%s) download failed!!!\n", path); + if (err) return 1; - } len = 0; buf = firmware->data; diff --git a/sound/pci/asihpi/hpidspcd.c b/sound/pci/asihpi/hpidspcd.c index 3603c24f34d2..bb748e14533e 100644 --- a/sound/pci/asihpi/hpidspcd.c +++ b/sound/pci/asihpi/hpidspcd.c @@ -46,8 +46,6 @@ short hpi_dsp_code_open(u32 adapter, void *os_data, struct dsp_code *dsp_code, err = request_firmware(&firmware, fw_name, &dev->dev); if (err || !firmware) { - dev_err(&dev->dev, "%d, request_firmware failed for %s\n", - err, fw_name); goto error1; } if (firmware->size < sizeof(header)) { diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c index 2706f271a83b..3b052f414f27 100644 --- a/sound/pci/cs46xx/cs46xx_lib.c +++ b/sound/pci/cs46xx/cs46xx_lib.c @@ -3253,11 +3253,8 @@ int snd_cs46xx_start_dsp(struct snd_cs46xx *chip) #ifdef CONFIG_SND_CS46XX_NEW_DSP for (i = 0; i < CS46XX_DSP_MODULES; i++) { err = load_firmware(chip, &chip->modules[i], module_names[i]); - if (err < 0) { - dev_err(chip->card->dev, "firmware load error [%s]\n", - module_names[i]); + if (err < 0) return err; - } err = cs46xx_dsp_load_module(chip, chip->modules[i]); if (err < 0) { dev_err(chip->card->dev, "image download error [%s]\n", diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index 1cb85aeb0cea..3882812ec3dd 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -60,11 +60,8 @@ static int get_firmware(const struct firmware **fw_entry, "firmware requested: %s\n", card_fw[fw_index].data); snprintf(name, sizeof(name), "ea/%s", card_fw[fw_index].data); err = request_firmware(fw_entry, name, pci_device(chip)); - if (err < 0) - dev_err(chip->card->dev, - "get_firmware(): Firmware not available (%d)\n", err); #ifdef CONFIG_PM_SLEEP - else + if (!err) chip->fw_cache[fw_index] = *fw_entry; #endif return err; diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 28e2f8b42f5e..5468c630cc2b 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -901,12 +901,8 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) } err = request_firmware(&emu->firmware, filename, &emu->pci->dev); - if (err != 0) { - dev_info(emu->card->dev, - "emu1010: firmware: %s not found. Err = %d\n", - filename, err); + if (err != 0) return err; - } dev_info(emu->card->dev, "emu1010: firmware file = %s, size = 0x%zx\n", filename, emu->firmware->size); diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 2ff692dd2c5f..d23749cf524f 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1806,10 +1806,8 @@ static void azx_firmware_cb(const struct firmware *fw, void *context) struct azx *chip = card->private_data; struct pci_dev *pci = chip->pci; - if (!fw) { - dev_err(card->dev, "Cannot load firmware, aborting\n"); + if (!fw) goto error; - } chip->fw = fw; if (!chip->disabled) { diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c index 9e1ad119a3ce..aa3224fe0daf 100644 --- a/sound/pci/korg1212/korg1212.c +++ b/sound/pci/korg1212/korg1212.c @@ -2332,7 +2332,6 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci, err = request_firmware(&dsp_code, "korg/k1212.dsp", &pci->dev); if (err < 0) { release_firmware(dsp_code); - snd_printk(KERN_ERR "firmware not available\n"); snd_korg1212_free(korg1212); return err; } diff --git a/sound/pci/mixart/mixart_hwdep.c b/sound/pci/mixart/mixart_hwdep.c index 5bfd3ac80db5..8dd77059a565 100644 --- a/sound/pci/mixart/mixart_hwdep.c +++ b/sound/pci/mixart/mixart_hwdep.c @@ -571,11 +571,8 @@ int snd_mixart_setup_firmware(struct mixart_mgr *mgr) for (i = 0; i < 3; i++) { sprintf(path, "mixart/%s", fw_files[i]); - if (request_firmware(&fw_entry, path, &mgr->pci->dev)) { - dev_err(&mgr->pci->dev, - "miXart: can't load firmware %s\n", path); + if (request_firmware(&fw_entry, path, &mgr->pci->dev)) return -ENOENT; - } /* fake hwdep dsp record */ err = mixart_dsp_load(mgr, i, fw_entry); release_firmware(fw_entry); diff --git a/sound/pci/pcxhr/pcxhr_hwdep.c b/sound/pci/pcxhr/pcxhr_hwdep.c index 80633055e17e..17b185d16f64 100644 --- a/sound/pci/pcxhr/pcxhr_hwdep.c +++ b/sound/pci/pcxhr/pcxhr_hwdep.c @@ -385,12 +385,8 @@ int pcxhr_setup_firmware(struct pcxhr_mgr *mgr) if (!fw_files[fw_set][i]) continue; sprintf(path, "pcxhr/%s", fw_files[fw_set][i]); - if (request_firmware(&fw_entry, path, &mgr->pci->dev)) { - dev_err(&mgr->pci->dev, - "pcxhr: can't load firmware %s\n", - path); + if (request_firmware(&fw_entry, path, &mgr->pci->dev)) return -ENOENT; - } /* fake hwdep dsp record */ err = pcxhr_dsp_load(mgr, i, fw_entry); release_firmware(fw_entry); diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index 94639d6b5fb5..45cd573e968f 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c @@ -1231,11 +1231,8 @@ static int try_to_load_firmware(struct cmdif *cif, struct snd_riptide *chip) if (!chip->fw_entry) { err = request_firmware(&chip->fw_entry, "riptide.hex", &chip->pci->dev); - if (err) { - snd_printk(KERN_ERR - "Riptide: Firmware not available %d\n", err); + if (err) return -EIO; - } } err = loadfirmware(cif, chip->fw_entry->data, chip->fw_entry->size); if (err) { diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index 7c8941b8b2de..f005690c1eab 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c @@ -5103,11 +5103,8 @@ static int hdsp_request_fw_loader(struct hdsp *hdsp) return -EINVAL; } - if (request_firmware(&fw, fwfile, &hdsp->pci->dev)) { - dev_err(hdsp->card->dev, - "cannot load firmware %s\n", fwfile); + if (request_firmware(&fw, fwfile, &hdsp->pci->dev)) return -ENOENT; - } if (fw->size < HDSP_FIRMWARE_SIZE) { dev_err(hdsp->card->dev, "too short firmware size %d (expected %d)\n", diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c index a67ea10f41a1..4c1259234832 100644 --- a/sound/soc/codecs/wm2000.c +++ b/sound/soc/codecs/wm2000.c @@ -889,10 +889,8 @@ static int wm2000_i2c_probe(struct i2c_client *i2c, } ret = request_firmware(&fw, filename, &i2c->dev); - if (ret != 0) { - dev_err(&i2c->dev, "Failed to acquire ANC data: %d\n", ret); + if (ret != 0) goto err_supplies; - } /* Pre-cook the concatenation of the register address onto the image */ wm2000->anc_download_size = fw->size + 2; diff --git a/sound/usb/6fire/firmware.c b/sound/usb/6fire/firmware.c index 62c25e74f0e5..42516f98ce06 100644 --- a/sound/usb/6fire/firmware.c +++ b/sound/usb/6fire/firmware.c @@ -219,8 +219,6 @@ static int usb6fire_fw_ezusb_upload( ret = request_firmware(&fw, fwname, &device->dev); if (ret < 0) { kfree(rec); - dev_err(&intf->dev, - "error requesting ezusb firmware %s.\n", fwname); return ret; } ret = usb6fire_fw_ihex_init(fw, rec); @@ -296,8 +294,6 @@ static int usb6fire_fw_fpga_upload( ret = request_firmware(&fw, fwname, &device->dev); if (ret < 0) { - dev_err(&intf->dev, "unable to get fpga firmware %s.\n", - fwname); kfree(buffer); return -EIO; }